Small twig improvements