Most of instruction set is correctly processed
merge conflicts fixed