important bugfixes