Merge remote-tracking branch 'origin/deploy'
updated map, some text improvements
cleanup