More tweaks to XP and Rank bonus formulas