Doc cleanup; still working on order