Some final typesetting improvements