Shader fixes, also attack line fixes