cleanup to make stats less confusing
minor cleanup
fix static variable couting