Update a couple of typos in comments.
Initialise canvas shape non-overlap padding variable.
Cleanup shortest-path template code to be in header.