shitload of bugfixes