little insignificant tweaks and bugfixes