- Merge fix, still need to fix texcoords