found bugs just as I was finishing....