Tweaks and Bugfixes