diff --git a/src/elements/encrypting/egenerate.js b/src/elements/encrypting/egenerate.js
index a5a2abf..3de3cb1 100644
--- a/src/elements/encrypting/egenerate.js
+++ b/src/elements/encrypting/egenerate.js
@@ -18,11 +18,8 @@ const EGenerate = () => {
 
     const [displayLoading, setDisplayLoading] = useState(false);
 
-    const [keyData, setKeyData] = useState({
-        username: '',
-        email: '',
-        thepasswd: ''
-    });
+    const [keyData, setKeyData] = useState({});
+    
     const [disabledGenerate, setDisabledGenerate] = useState(true);
 
     const keySchema = Joi.object({
@@ -60,8 +57,6 @@ const EGenerate = () => {
     const clickGenerate = (e) => {
         e.preventDefault();
 
-        setKeyData({...keyData, thetag: randomBytes(4).toString('hex')});
-
         /**
          * disable the genreate button, until key has 
          * completed generating
@@ -77,13 +72,14 @@ const EGenerate = () => {
             passphrase: keyData.thepasswd,
             format: 'armored'
         }).then((keyPair) => {
-            let zip = new JSZip();
-            zip.file("handshake-enc-" + keyData.thetag + ".pem", keyPair.privateKey);
-            zip.file("handshake-enc-" + keyData.thetag + ".pub", keyPair.publicKey);
+            const theTag = randomBytes(4).toString('hex');
+
+            const zip = new JSZip();
+            zip.file("handshake-enc-" + theTag + ".pem", keyPair.privateKey);
 
             if(JSZip.support.uint8array) {
                 zip.generateAsync({type: 'blob'}).then((blob) => {
-                    saveAs(blob, "handshake-enc-" + keyData.thetag + ".zip");
+                    saveAs(blob, "handshake-enc-" + theTag + ".zip");
                 });
             }
             
diff --git a/src/elements/encrypting/encrypt.js b/src/elements/encrypting/encrypt.js
index 0f014f6..fac3288 100644
--- a/src/elements/encrypting/encrypt.js
+++ b/src/elements/encrypting/encrypt.js
@@ -120,8 +120,9 @@ const Encrypt = () => {
     };
 
     useEffect(() => {
+        console.log(encData);
         setDisplayErrorMsg(!(errorMessage === ""));
-    }, [errorMessage]);
+    }, [errorMessage, encData]);
 
     return (
         <>
@@ -138,7 +139,7 @@ const Encrypt = () => {
                 <input type='file' ref={refUploadKey} multiple={false} onChange={changeUploadKey} style={{display: 'none'}} />
                 <ButtonGroup>
                     <Button onClick={e => {refUploadMsg.current.click();}}>add signed message</Button>
-                    <Button disabled={disableUploadKey} onClick={e => {refUploadKey.current.click();}}>add encrpytion key</Button>
+                    <Button disabled={disableUploadKey} onClick={e => {refUploadKey.current.click();}}>add public key</Button>
                     <Button disabled={disableEncryptIt} onClick={clickEncryptIt}>encrypt!</Button>
                 </ButtonGroup>
             </Stack>
diff --git a/src/elements/signing.js b/src/elements/signing.js
index f3b8115..dfd75a9 100644
--- a/src/elements/signing.js
+++ b/src/elements/signing.js
@@ -79,13 +79,13 @@ const Signing = () => {
                                             <Nav.Link eventKey="generate">generate</Nav.Link>
                                         </Nav.Item>
                                         <Nav.Item>
-                                            <Nav.Link eventKey="encrypt">encrypt</Nav.Link>
+                                            <Nav.Link eventKey="pubkey">public key</Nav.Link>
                                         </Nav.Item>
                                         <Nav.Item>
-                                            <Nav.Link eventKey="decrypt">decrypt</Nav.Link>
+                                            <Nav.Link eventKey="encrypt">encrypt</Nav.Link>
                                         </Nav.Item>
                                         <Nav.Item>
-                                            <Nav.Link eventKey="pubkey">public key</Nav.Link>
+                                            <Nav.Link eventKey="decrypt">decrypt</Nav.Link>
                                         </Nav.Item>
                                     </Nav>
                                 </Col>
@@ -94,15 +94,15 @@ const Signing = () => {
                                         <Tab.Pane eventKey="generate">
                                             <EGenerate />
                                         </Tab.Pane>
+                                        <Tab.Pane eventKey="pubkey">
+                                            <PubKey />
+                                        </Tab.Pane>
                                         <Tab.Pane eventKey="encrypt">
                                             <Encrypt />
                                         </Tab.Pane>
                                         <Tab.Pane eventKey="decrypt">
                                             <Decrypt />
                                         </Tab.Pane>
-                                        <Tab.Pane eventKey="pubkey">
-                                            <PubKey />
-                                        </Tab.Pane>
                                     </Tab.Content>
                                 </Col>
                                 <Col lg={3}>
@@ -114,7 +114,8 @@ const Signing = () => {
                                         <span className='small fw-semibold'>example: handshake-enc-&lt;tag id&gt;.zip</span>
                                     </Alert>
                                     <Alert variant='warning'>
-                                        <span className='fs-3 text'>2.</span> use your signed packet, to encrypt the clear text message from the signing process.
+                                        <span className='fs-3 text'>2.</span> 
+                                        use your signed packet, to encrypt the clear text message from the signing process.
                                         <br />
                                         <span className='small fw-semibold'>example: handshake-secret-&lt;enc id tag&gt;.zip</span>
                                     </Alert>
diff --git a/src/elements/signing/generate.js b/src/elements/signing/generate.js
index 55d7df6..1085676 100644
--- a/src/elements/signing/generate.js
+++ b/src/elements/signing/generate.js
@@ -13,11 +13,7 @@ const Generate = (props) => {
 
     const [clickGenerateDisabled, setClickGenerateDisabled] = useState(true);
 
-    const [signingData, setSigningData] = useState({
-        thename: '',
-        theemail: '',
-        thepasswd: ''
-    });
+    const [signingData, setSigningData] = useState({});
 
     const signingSchema = Joi.object({
         thename: Joi.string().min(3).max(30).required(),
@@ -26,7 +22,7 @@ const Generate = (props) => {
     });
 
     const cleanUp = () => {
-        setSigningData({ theemail: "", thename: "", thepasswd: "" });
+        setSigningData({});
         refTheEmail.current.value = "";
         refTheName.current.value = "";
         refThePasswd.current.value = "";
@@ -35,8 +31,6 @@ const Generate = (props) => {
     const clickGenerate = (e) => {
         e.preventDefault();
 
-        setSigningData({...signingData, thetag: randomBytes(4).toString('hex')});
-
         generateKey({
             type: 'ecc',
             curve: 'curve25519',
@@ -51,19 +45,22 @@ const Generate = (props) => {
         }).then((kee) => {            
             cleanUp();
 
+            const theTag = randomBytes(4).toString('hex');
+
             let zip = new JSZip();
-            zip.file("handshake-sign-" + signingData.thetag + ".priv", kee.privateKey);
-            zip.file("handshake-sign-" + signingData.thetag + ".pub", kee.publicKey);
+            zip.file("handshake-sign-" + theTag + ".priv", kee.privateKey);
+            zip.file("handshake-sign-" + theTag + ".pub", kee.publicKey);
 
             if(JSZip.support.uint8array) {
                 zip.generateAsync({type: 'blob'}).then((blob) => {
-                    saveAs(blob, "handshake-sign-" + signingData.thetag + ".zip");
+                    saveAs(blob, "handshake-sign-" + theTag + ".zip");
                 });
             }
         });
     };
 
     useEffect(() => {
+        console.log(signingData);
         let val1 = signingSchema.validate(signingData);
         setClickGenerateDisabled(val1.error);
     }, [signingData]);
diff --git a/src/index.js b/src/index.js
index d4c7b31..e52be18 100644
--- a/src/index.js
+++ b/src/index.js
@@ -12,7 +12,7 @@ const Main = (props) => {
             <Container>
                 <Row>
                     <Col lg={12}>
-                        <h1>handshake <Badge bg='dark'>v0.0.3</Badge></h1>
+                        <h1>handshake <Badge bg='dark'>v0.0.4</Badge></h1>
                     </Col>
                 </Row>
                 <Row>