Fixed Interpreter, refactored a bit by Lint