Fix variable name bug
Limit/Sample setitngs now in options object. Organize data