consolidate and more doc fixes