Testing round! Bunch of bugfixes...