Updated textures + cleanup