important bugfixes, read todos