overall bugfixes