Bugfixes, Round 2

More brain farts resolved - almost ready for mass testing