fix rest of the keys