Renaming of units + added more calculations.