fix and remove some mapkeys