Added flip to the Wiggle class, plus some small other changes