texture-fitting fix, other fixes