More docs and simplifications.