Cleaned up code, standardized a few things.  I think the readings for the three are accurate now