discovered a bunch of failed commits

subsequently re-fixed bad code