First fixed to registry / help classes
Minor fixes and comments
Merge branch 'fix-registry' into fixed