Updated percent Calculation
Updated interest calc
Merge remote-tracking branch 'origin/master' into Ivan