Nitpick + minor additions to templates