Added maps and touched up some code.