Fixed math mistake that broke upgrading
Renamed variables in Tower for clarity.