more hotfixes and bugfixes

yeh