added jumps, fixed problem with handling labels, and added tests