added nunjucks and some cleanup.