updated to take care of ace-jump-mode crap