Changed some typesetting