Updated instruction set, and a few changes