Add turning points, correct tags