Reorganized and improved and added to the mappings, and updated the README with
a few more.