fix texture + cleanup