some bigger typesetting improvements