major stability improvements