rewrote map generator to use specializing methods; minor changes