hehe bugs...

should be ok now