Fixed some bugs
Support more instructions