Bunch of fixes. Scopes, steps.