Fixed up some templates and added a few personal favorites