fix NPE and add textures