Correct a typos in keys.
working logic
Typo and other updates.