Add to canvases done
Small tweak to template
Reorganized code
Small tweaks to comments, variable names