Added some sugar.
Fixed templates.