Add key, fix some text