Updated maps and flags and formatting changes.