Added maps, improved logging, added commenting functionality.