added support for angle brackets
added option to disable jumps in normal mode