Completed map converter XML.

Other code improvements.