Tested the collision stuff further and fixed some bugs. Of course found a lot more as well.