some more testing for map layers, and a few changes to the text
Merge branch 'dev'