general stability improvements