Pull in Upstream Changes

Mostly doc updates, couple of code readability updates.