Added further typesetting options