texture fixes
texture some fixes merged from work