minor bugfixes after testing