Hacking and bugfixes