progress on help page
Merge branch 'master' into afro