More work on the analysis reporting system.