little bit of structure
Close #134 - test and fix for bug caused by an event missing its location.