Fix a few bugs left after some earlier refactors
Reduce number of null datapoints
Remove some TODOs from report