More fixes for accuracy of data
Fixes for Epiphany