Cleans up calculation
Restores speed to calculation
Fixes placement of Charm labels
Calculation of text areas was broken