added jumps, fixed some errors