much bugfixes