clean up and documentation
Merge branch 'add-general-maps-and-aliases'