general stability and quality improvments