and stability improvements