1 bugfix. Was not able to solve the other bug. Pls do not use it to This is Not for everyone to See.. I don't know if I could make it unlisted though..
