Cleaned up code
Merge branch 'mapmanager'