added math methods
some space
better collisions for all