Tiny bit of reorg in shaders and more comments