Reworkint the key generation.
Adding more internal variables to the dump.