Added basics of new flags.
More tweaks.