Make some cleanup, and make the instructionset complete.