Fix textures and further figure work