Better collision checking
Added some object classes