Improvemetns in Jump highlight functionality, Still hairy code