Updated collision detection, physics still broken

- collision detection updated
- physics still act weird