clean up collision and add some tiles