More code, doc changes