Fix broken oil textures.
Clean up code a bit.