some final revisions to xmlgen2.py, added mapping file