TODO Cleanups Normalize/simplify flags. There's too many with overlapping functionality. Tests! Function comments. Features