A lot of bugfixes...