Updated cipher storage.
Some minor updates