Changed old to use g instead of jmap -- slowdown!
Changed shortmap to be strict in i