hotfixes

important bug fixes