AngleAligner and other changes