Cleanup and update more section stats