Events overhaul
Author in second position
Minor fix
Merge pull request #732 from DraculeMihawk/patch-10

Events overhaul