Order counter added, other formatting adjustments