Added a single debt to calculation of non-IRA savings amount.
Added a discount percentage to both IRA and non-IRA savings.