Some codechanges and bugfixes for Twig inside some modules.