Correctly calclate bonuses, lower diffs, and UI improvements for all