diff --git a/src/api.go b/src/api.go
index 461f3084..4766ee60 100644
--- a/src/api.go
+++ b/src/api.go
@@ -25,7 +25,7 @@ func (c *Croc) Relay() error {
 // Send will take an existing file or folder and send it through the croc relay
 func (c *Croc) Send(fname string, codePhrase string) (err error) {
 	// prepare code phrase
-
+	defer c.cleanup()
 	c.cs.Lock()
 	c.cs.channel.codePhrase = codePhrase
 	if len(codePhrase) == 0 {
@@ -125,6 +125,7 @@ func (c *Croc) Send(fname string, codePhrase string) (err error) {
 
 // Receive will receive something through the croc relay
 func (c *Croc) Receive(codePhrase string) (err error) {
+	defer c.cleanup()
 	if !c.NoLocal {
 		// try to discovery codephrase and server through peer network
 		discovered, errDiscover := peerdiscovery.Discover(peerdiscovery.Settings{
diff --git a/src/client.go b/src/client.go
index e1d96635..e7e413a8 100644
--- a/src/client.go
+++ b/src/client.go
@@ -25,7 +25,6 @@ var isPrinted bool
 
 func (c *Croc) client(role int, channel string) (err error) {
 	defer log.Flush()
-	defer c.cleanup()
 	// initialize the channel data for this client
 
 	interrupt := make(chan os.Signal, 1)
@@ -64,7 +63,7 @@ func (c *Croc) client(role int, channel string) (err error) {
 				log.Debugf("sender read error:", err)
 				return
 			}
-			log.Debugf("recv: %s", cd.String2())
+			// log.Debugf("recv: %s", cd.String2())
 			err = c.processState(cd)
 			if err != nil {
 				log.Warn(err)
diff --git a/src/files.go b/src/files.go
index b1fce9de..19ceba87 100644
--- a/src/files.go
+++ b/src/files.go
@@ -15,6 +15,10 @@ import (
 )
 
 func (c *Croc) processFile(src string) (err error) {
+	log.Debug("processing file")
+	defer func() {
+		log.Debug("finished processing file")
+	}()
 	fd := FileMetaData{}
 
 	// pathToFile and filename are the files that should be used internally
@@ -84,9 +88,12 @@ func (c *Croc) processFile(src string) (err error) {
 }
 
 func (c *Croc) getFilesReady() (err error) {
+	log.Debug("getting files ready")
+	defer func() {
+		log.Debug("files ready")
+	}()
 	c.cs.Lock()
 	defer c.cs.Unlock()
-	log.Debug("getting files ready")
 	c.cs.channel.notSentMetaData = true
 	// send metadata
 
@@ -104,26 +111,31 @@ func (c *Croc) getFilesReady() (err error) {
 	var passphrase []byte
 	passphrase, err = c.cs.channel.Pake.SessionKey()
 	if err != nil {
+		log.Error(err)
 		return
 	}
 	// encrypt file data
 	c.crocFileEncrypted = tempFileName("croc-encrypted")
 	err = encryptFile(c.crocFile, c.crocFileEncrypted, passphrase)
 	if err != nil {
+		log.Error(err)
 		return
 	}
 	// remove the unencrypted versoin
 	if err = os.Remove(c.crocFile); err != nil {
+		log.Error(err)
 		return
 	}
 	c.cs.channel.fileMetaData.IsEncrypted = true
 	// split into pieces to send
 	log.Debugf("splitting %s", c.crocFileEncrypted)
 	if err = splitFile(c.crocFileEncrypted, len(c.cs.channel.Ports)); err != nil {
+		log.Error(err)
 		return
 	}
 	// remove the file now since we still have pieces
 	if err = os.Remove(c.crocFileEncrypted); err != nil {
+		log.Error(err)
 		return
 	}
 
@@ -131,20 +143,19 @@ func (c *Croc) getFilesReady() (err error) {
 	var metaDataBytes []byte
 	metaDataBytes, err = json.Marshal(c.cs.channel.fileMetaData)
 	if err != nil {
+		log.Error(err)
 		return
 	}
 	c.cs.channel.EncryptedFileMetaData = encrypt(metaDataBytes, passphrase)
 
 	c.cs.channel.Update = true
-	log.Debugf("updating channel")
+	log.Debugf("updating channel with file information")
 	errWrite := c.cs.channel.ws.WriteJSON(c.cs.channel)
 	if errWrite != nil {
 		log.Error(errWrite)
 	}
 	c.cs.channel.Update = false
 	go func() {
-		// encrypt the files
-		// TODO
 		c.cs.Lock()
 		c.cs.channel.fileReady = true
 		c.cs.Unlock()