Some TODO notes.
Bugfixes.
Half-way commit to getting hardcoded paths out of templates.