Add end activity. Fix update typing state.