Cleanups 1

3 otherwise unrelated cleanups and doc updates. Nothing spectacular here.