Doc updates on develop

Doc changes rebased onto current develop