Adds and fixes Type2 instructions