typos
whitespace
better template blocks granularity