Trainer corrected; Goal event alarma added