track latest aurora + minor grouping and formatting changes