fixed mapping
clean up and fixing mapping
updates and fixes to version