Added collision for objects
Made a lot of fixes to a lot of functions