Tentatively change check module/progam function names
Add noew option for event number to plot
Reshuffle and clean up a bit