More docs and a few simplifications