Cleanup, Bugfixes.