Violation counters

Cleaned up where/how info gets saved