Fixed numerical comparisons.  Added some formatting.