Adding some map searching capabilities
Merge branch 'maps'
Switching back to proper bounds fitting