general stability improvments