Step within partials, fix bugs