Refactoring and improvements to the commands and especially help stuff.