Expose smooth option through delegate, fix diffs

Merge updates