Text layout and indentation improved.