Add Textures and fixes