Fixed the silly problem of successes and failures getting swapped and a bit more.