woah, more bugfixes

it seems to have been a bit late when i tried to merge this yesterday