Added some more maps and further reduced magic #s.