Some formatting/axis/angle changes