Bugfixing + tweaks