clean up (mostly) one failure case, and remove a bunch of "O"'s on start