Bug fixes, finish up coding the data collection side of things