reformatted to uniform 2 space indentation, added info about Marshall
updated event descriptions