Bugfixes and WIP