Fixed lots of bugs with instruction set

Can almost see IBM log (seems to be in the right place but looks
a little weird).