some more random changes
changing event js calls to the great and powerful object
Merge branch 'EMAx'