Initial merge in of C&P's help system improvements
Initial merge of C&P help system improvements