moar fixes :D

some more bugfixes..