Better sphere and triangle parsing