small tweaks / bugfixes