bugfixes

Whatttupp