smaller bugfixes/changes