Fixes, additions, smoothing