Bugfixes, cleanup