Doing some various clean up. Also added another shader.