More output changes to match actual counting instead of 0-based indexing.