fix map + add new textures refactoring