Completed update to the latest mappings and ...

... some general improvements