Fix typos, overlooked parts, scoping/template mixups.