Update formatting and add spring reports to the archive