again, minor bugfixes