Merge changes from Jos. Add some more sections