small changes and tweak to mapping file