Mainly doc updates and minor configuration changes