All besides intepreter logic fixed