some minor bugfixes