- Use CapacityBonus rather than ReachablilityBonus in the Capacity calculation - Persist CapacityBonus rather than ReachabilityBonus - Include SpeedBonus in the Speed calculation - Prevent negative values in Speed and Capacity when using bonuses - Clean up SpeedCalculator.java