more shader fixes
merge commit