minor adjustments; starting to refactor Texture