Added units and fixed winding index errors