+ bug fixes from recently deleted old partials