diff --git a/cmd/notary/tuf.go b/cmd/notary/tuf.go
index 6823c3e8a1..db29cd443d 100644
--- a/cmd/notary/tuf.go
+++ b/cmd/notary/tuf.go
@@ -88,6 +88,7 @@ func tufAdd(cmd *cobra.Command, args []string) {
 		fatalf(err.Error())
 	}
 
+	fmt.Println("Loading TUF Repository.")
 	rootJSON, err := filestore.GetMeta("root", 0)
 	if err != nil {
 		fatalf(err.Error())
@@ -129,11 +130,13 @@ func tufAdd(cmd *cobra.Command, args []string) {
 	}
 	repo.SetTimestamp(timestamp)
 
+	fmt.Println("Generating metadata for target")
 	meta, err := data.NewFileMeta(bytes.NewBuffer(b))
 	if err != nil {
 		fatalf(err.Error())
 	}
 
+	fmt.Printf("Adding target \"%s\" with sha256 \"%s\" and size %s bytes.\n", targetName, meta.Hashes["sha256"], meta.Length)
 	_, err = repo.AddTargets("targets", data.Files{targetName: meta})
 	if err != nil {
 		fatalf(err.Error())
@@ -232,8 +235,7 @@ func tufList(cmd *cobra.Command, args []string) {
 
 	err = c.Update()
 	if err != nil {
-		fmt.Println("Update failed")
-		fatalf(err.Error())
+		return
 	}
 	for name, meta := range repo.Targets["targets"].Signed.Targets {
 		fmt.Println(name, " ", meta.Hashes["sha256"], " ", meta.Length)
@@ -282,8 +284,7 @@ func tufLookup(cmd *cobra.Command, args []string) {
 
 	err = c.Update()
 	if err != nil {
-		fmt.Println("Update failed")
-		fatalf(err.Error())
+		return
 	}
 	meta := c.TargetMeta(targetName)
 	if meta == nil {
@@ -295,10 +296,11 @@ func tufLookup(cmd *cobra.Command, args []string) {
 func tufPublish(cmd *cobra.Command, args []string) {
 	if len(args) < 1 {
 		cmd.Usage()
-		fatalf("must specify a GUN")
+		fatalf("Must specify a GUN")
 	}
 
 	gun := args[0]
+	fmt.Println("Pushing changes to ", gun, ".")
 
 	remote, err := store.NewHTTPStore(
 		"https://vetinari:4443/v2/"+gun+"/_trust/tuf/",
@@ -356,16 +358,15 @@ func tufRemove(cmd *cobra.Command, args []string) {
 }
 
 func saveRepo(repo *tuf.TufRepo, filestore store.MetadataStore) error {
+	fmt.Println("Saving changes to TUF Repository.")
 	signedRoot, err := repo.SignRoot(data.DefaultExpires("root"))
 	if err != nil {
 		return err
 	}
-	fmt.Println("Marshalling root")
 	rootJSON, _ := json.Marshal(signedRoot)
 	filestore.SetMeta("root", rootJSON)
 
 	for r, _ := range repo.Targets {
-		fmt.Println("Marshalling ", r)
 		signedTargets, err := repo.SignTargets(r, data.DefaultExpires("targets"))
 		if err != nil {
 			return err
@@ -380,7 +381,6 @@ func saveRepo(repo *tuf.TufRepo, filestore store.MetadataStore) error {
 	if err != nil {
 		return err
 	}
-	fmt.Println("Marshalling snapshot")
 	snapshotJSON, _ := json.Marshal(signedSnapshot)
 	filestore.SetMeta("snapshot", snapshotJSON)
 
@@ -388,7 +388,6 @@ func saveRepo(repo *tuf.TufRepo, filestore store.MetadataStore) error {
 	if err != nil {
 		return err
 	}
-	fmt.Println("Marshalling timestamp")
 	timestampJSON, _ := json.Marshal(signedTimestamp)
 	filestore.SetMeta("timestamp", timestampJSON)
 	return nil
diff --git a/server/handlers/default.go b/server/handlers/default.go
index 5a922f9310..5d7bdade31 100644
--- a/server/handlers/default.go
+++ b/server/handlers/default.go
@@ -53,7 +53,7 @@ func UpdateHandler(ctx context.Context, w http.ResponseWriter, r *http.Request)
 		}
 	}
 	vars := mux.Vars(r)
-	qdn := vars["imageName"]
+	gun := vars["imageName"]
 	tufRole := vars["tufRole"]
 	input, err := ioutil.ReadAll(r.Body)
 	if err != nil {
@@ -73,7 +73,7 @@ func UpdateHandler(ctx context.Context, w http.ResponseWriter, r *http.Request)
 		}
 	}
 	version := meta.Signed.Version
-	err = store.UpdateCurrent(qdn, tufRole, version, input)
+	err = store.UpdateCurrent(gun, tufRole, version, input)
 	if err != nil {
 		return &errors.HTTPError{
 			HTTPStatus: http.StatusInternalServerError,
@@ -96,11 +96,12 @@ func GetHandler(ctx context.Context, w http.ResponseWriter, r *http.Request) *er
 		}
 	}
 	vars := mux.Vars(r)
-	qdn := vars["imageName"]
+	gun := vars["imageName"]
 	tufRole := vars["tufRole"]
-	data, err := store.GetCurrent(qdn, tufRole)
+	data, err := store.GetCurrent(gun, tufRole)
 	logrus.Debug("JSON: ", string(data))
 	if err != nil {
+		logrus.Errorf("[Vetinari] 500 GET repository: %s, role: %s", gun, tufRole)
 		return &errors.HTTPError{
 			HTTPStatus: http.StatusInternalServerError,
 			Code:       9999,
@@ -108,6 +109,7 @@ func GetHandler(ctx context.Context, w http.ResponseWriter, r *http.Request) *er
 		}
 	}
 	if data == nil {
+		logrus.Errorf("[Vetinari] 404 GET repository: %s, role: %s", gun, tufRole)
 		return &errors.HTTPError{
 			HTTPStatus: http.StatusNotFound,
 			Code:       9999,