Scaling at the correct spot in the calculation now.

Also fixed the extra reporting of training points gained from the daily bonus.