bugs fixed, sorry i don't have a testing environment...