Several refinements made to be more flexible and work better on
different platforms an different fonts.