added consolidated_penalties function for penalty processing
Merge branch 'master' into events_rework