Fix typos and do some smoothing