updated 10/04/14

worked on some collision