diff --git a/Habitica/src/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java b/Habitica/src/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java
index c03346a90..8b4e2d213 100644
--- a/Habitica/src/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java
+++ b/Habitica/src/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java
@@ -22,7 +22,6 @@ public class HabitRPGUserCallback implements Callback<HabitRPGUser> {
 
     @Override
     public void success(HabitRPGUser habitRPGUser, Response response) {
-        Log.d("db", "saving");
         habitRPGUser.async().save();
 
         
@@ -33,8 +32,6 @@ public class HabitRPGUserCallback implements Callback<HabitRPGUser> {
     public void failure(RetrofitError error) {
         Crashlytics.getInstance().core.logException(error);
 
-        Log.w("OMG", "user failed!" + error.getMessage());
-
         mCallback.onUserFail();
     }
 
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
index 2c415232b..a1ee46f74 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
@@ -115,14 +115,15 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
         if(evnt.completed && evnt.Task.getType().equals("todo")){
             // remove from the list
             observableContent.remove(evnt.Task);
-            filter();
         }
+        this.updateTask(evnt.Task);
+        filter();
     }
 
     public void onEvent(TaskUpdatedEvent evnt) {
         if (!taskType.equals(evnt.task.getType()))
             return;
-
+        this.updateTask(evnt.task);
         filter();
     }
 
@@ -134,6 +135,16 @@ public class HabitItemRecyclerViewAdapter<THabitItem extends Task>
         filter();
     }
 
+    private void updateTask(Task task) {
+        int i;
+        for(i = 0; i < this.observableContent.size(); ++i) {
+            if (observableContent.get(i).getId().equals(task.getId())) {
+                break;
+            }
+        }
+        observableContent.set(i, task);
+    }
+
     private void filter() {
         if (this.tagsHelper.howMany() == 0) {
             filteredObservableContent = observableContent;
diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java
index 371802d0f..6e3611801 100644
--- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java
+++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java
@@ -488,7 +488,6 @@ public class TasksFragment extends BaseFragment implements TaskScoringCallback.O
 
     public void onEvent(final TaskSaveEvent event) {
         Task task = (Task) event.task;
-        Log.d("tags", "Task saving");
         if (event.created) {
             this.mAPIHelper.createNewTask(task, new TaskCreationCallback());
             updateTags(event.task.getTags());