More docs; time to merge, I think