scope shader & logic fixes

Published --