change encryption strategies, fix stale state