too much bugfixes