Fixed aggressive smoothing
Minor update to "window" matching