Tweaks, and working template.