Physics

Added better collision handling.