scope - small improvements