Changed CollisionType and ZIndexing to use enum and fixed collision methods