Mix of bugfixes, small additions and such