Correctly fixed key registration system, now remembers keys.