Corrected some percentage calculations