Fix typos and only flash success after group has been checked