all the bugfixes