Consolidate docs

Forgot to send this PR yesterday :) 
Mostly making things consistent.

r? @potch @pennyfx