Event feature

Small fixes