bug fix
fix parens
fmt
remove DataFlagFin
fix comments