Cleanup, fixed UV mapping (again (properly))