Further testing, small bugfixes and overlooked glitches