Reordered and fixed Fly locations. Fixes #30.