Believe I fixed all the bugs.  Our accuracy went up again to its previous state of around 54%.