More cleanup and trying to get the summary page to never crash