better Twig loading
various changes, mostly template-related