minor changes to line ordering.