Various fixes.
Initial release.