some more minor tweaks and bugfixes