Improved log messages.
Started isolating Map data.