yay, more bugfixes ^^