progress on docs, some cleanup