Event more objects, minor changes