Commander wording + fixes.