attempt to clear up the bugs list a bit