some creative bugfixes