Tested and fixed map parsing.