Remove references of pensionwise
Fix validation error
Update calculator output text