some clean up, stable now