small modifications to how instructions are managed in assembler
fixed merge conflict