Help text and commands are now working together better
merge