More work on Keyboardmap, implemented MauronCode_dataMap
merged
Post-merge cleanup