Added textures & fixed internal name issues