Sorry, i'll tidy that up tomorrow.  I think my local branch also has a slight improvement to the template which I'll also push.