tweaks and bugfixes