Updated training scenarios, fixed editor annotation error messages