fix lint errors
some small updates for readability
cherry picking from gh-pages
merging master
rebuild after merge