remove debug stuff and bugfixes