a few changes for stability
merging in stability changes