improved --watch and interactive --eval behavior. fixed an infinite loop