load of bugfixes