More work on map loading from text file