Minor changes, starting to finish reporting