bug hunting and a (small) new set of widget code