Fix encoding of ADD and SUB family of instructions. Also rearrange