GLSL => glsl
a few flake fixes