Better textures + 2 bugfixes!