some docs, organization, and a bug fix