More docs, cleanup