1am version (testing started)

lots o' bugs removed; lots o' bugs remain