Improved comments
Fixed up some parts of mapgen
Updated TODO list