Map update

- fixed some collision bugs in the map