small tweaks and bugfixes