Bugfixes

should work basicly now