fixes for users
updates to twig
added magic set