Redordered flipClose functions
Minor tweaks.