Change branch-immediate to take proper number of registers and fix mov and movi