Lots of bugfixes after UA testing