Added a few more opcodes
Merge branch 'johns_branch'