Some improvement and Keybase verification