update: scopes and minor changes