Add wayorder flags. Removing conflicting invert flags.