updated docs, cleanup