bugfixes

not tested