tweaks to butterflies, animation, plus reformatting to match coding standard