Update some Opcodes and more cleanup