added better collision detection and worked on the jumping