Integrating Richard's texture updates. Hopefully all is correct.