Shader reload now handles errors well. Minor other fixes.