Minor bugfixes, cleanup.
Updated project file.