Fixed Flare. Tweaked stuff