Fixed up mapper1 a bit, added mapper2 support (untested)