implemented Jeff Allens suggestions

visible changes:
renamed keyId to hotkeys