changed most of the key names
moved keys to alphabetical order