Added restart events into Activator and Editor; bug fixes