Map fixes

- Made more tight upon request
- Fixed area mapping