some reformatting
some opcode improvements