Updated collision and entities
Still updating
Again