lots of updates, some niffty syntax checks so I don't go crazy with lots of issues
twig stuff