Feature/cloudify 1989 event touchups