Updates to averages tables and tidy up