Add new textures and fix some bugs