Variable Final -> N, also small comment fix