Bugfixes
Cleanup