Made corrections to keyboard remapping