Added Labels and fixed some calculations