tweaks to butterflies, animation, plus reformatting to match coding standard
Merge pull request #3352 from ZappoMan/virtualEntities

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