Tweaks and bugfixes.