Some minor changes
Fixed stuff
More work on collision
Fixed collision detection between cells
merge