loads of bugfixes
more bugfixes