Changed nps for better statistics. Renamed tallies for proper ordering in outp.