Added map changes for #987 #988 #990 #992
Merge pull request #998 from EPuncker/master

Added map changes for #987 #988 #990 #992