lots of changes, incorporated most of the mappings