docs, template cleanup, and more!