Errors fixed.  Certain formulas made more general.