multiple doc updates and minor refactors