Collision fix v0.1

Fixed quite a few issues, still working on collision detection