improve balance and total budget calculation
Merge remote-tracking branch 'origin/master'