- fix bug in code that has stretchtoggle
 - fix some (not all) tests that broke in the recent bundle update