more fixes to mnemonics