Improvements to the interpreter/tool.