clean up
allow locally created maps
Merge branch 'add-general-maps-and-aliases'