Minor changes on MapParser;
Add comments