Improvements to help file, re-order and simplification