Fix abort in the wrong place (is it?)
Add more opcodes, some fixes