Improve the CommandServer tooltip

Includes the grammar fix from #953