removing event lists for redundancy
trimmed too much from triggers file
some small additions