Tweaks to flex rules and main section