merges from Neo, event impementation and tidying