Documentation upgrades and small bug fixes