tweaks so boundaries works - more work needed though