scopes fixed, other updates, tests run, pass not