removed global Map reference
incorporating lots of fixes from graphics.lib, and some minor fixes from audio.lib