Changed TP and MP and XP again -- calculations now use 0-baseline tp and mp to simplify estimation formula.

Changed estimation formula to duration = baseline*xp_modifier * (1. + tp + mp)