KA-Annuity

Finish work on annuity calculations. Other tweaks to calculations and formatting.