Expose smooth option through delegate, fix diffs
conflict fixes