Templates were updated by pteague. Also a little change by ed_mann.