Move upright to placement properties.
Add xml read/write for label-position-tolerance and spacing.
Clean up