Smoothing out the last couple bugs