Complete #75 by indenting the templates

A few smaller bugs were also found mostly in lost tags and
stuff and were fixed too.