Implement remaining smoothing cases

- Still see some edges not smoothed