more stability improvements