Bugfixes

i have no idea what i am doing