minor bugfixes again