#34: Cleanup and bugfixes.