Update some Opcodes and more cleanup

Signed-off-by: lasoto <nansin_@abv.bg>