Initial work fixing the alignment display and calculation. #68