minor bugfixes of some sort