minor changes to the interpreter
merge