· Logic and stability improvements