Use more templates, improve copy, fix bugs