Fixed calc.collisionRect, minor changes & additions