added NP PP counter, output format contains tags again, ready to ship