Better twig output.
Cleaned up comments a bit.