few tweaks and allowing ctrl+shift keys to work