Misc fixes

this is dangerous; the limits must be set to something - and because this is factory, it should be conservative

related: pls see comments in #70 -- some of the logic needs to be moved out to wraps