various corrections
Merge branch 'master' of https://github.com/DigitalPublishingToolkit/toolkit
TOD