Improve make-global-env, initial-state; tests for jumps