Bugfixes + tweaks.