Customised .gitignore and fixed Map-related classes

Customised .gitignore and fixed Map-related classes
per discussion.