Adding maps, fixing bugs.