Improved typesetting.