Improvements to help mechanism.