added descriptions
Some more documentation, fixed mapping file