clean up
opcode decoding bugfix
synchronize with master