resolving issues and some simple work with twig
some cahnges & simple work with twig