Fix uvs; cleanup