more minor bugfixes