scope - various changes, v0.91