Minor changes for final data collection

This will probably be my last commit...too bad I have other work to move
onto, this was a fun little side project.