Update README and some keys in implementation