Multiple updates to the XLS report generator, redux