Lots of bugfixes