ignore .layout
Fixed calcDist et calcAvg