Better comments, fixed some typos, and MUCH smarter template serving