more cleanup for bread crumbs -- and a new bug was found