diff --git a/changelog b/changelog
index 32a61f5..753b6d3 100644
--- a/changelog
+++ b/changelog
@@ -35,6 +35,10 @@ export (QQ's a zone into a tarball)t
 Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist)
 (lots of major bugfixes too)
 
+[Dec 23 2008] - Rumble
+  Fix for drink containers improperly showing empty due to unlimited container addition. (thanks Parnassus)
+  Fix for qedit crash when trying to list non-existent next quest. (thanks Tails)
+  Fix for ITEM_NOTE in oedit_disp_val1_menu function in oedit.c. (thanks Parnassus)
 [Dec 04 2008] - Fizban
   DG Scripts are now attachable to players (cedit toggle defaults this behavior to off).
 [Dec 01 2008] - Fizban
diff --git a/src/act.informative.c b/src/act.informative.c
index 9350202..21471da 100644
--- a/src/act.informative.c
+++ b/src/act.informative.c
@@ -569,7 +569,7 @@ static void look_in_obj(struct char_data *ch, char *arg)
 	list_obj_to_char(obj->contains, ch, SHOW_OBJ_SHORT, TRUE);
       }
     } else {		/* item must be a fountain or drink container */
-      if ((GET_OBJ_VAL(obj, 1) == 0) && (!GET_OBJ_VAL(obj, 0) == 1))
+      if ((GET_OBJ_VAL(obj, 1) == 0) && (!GET_OBJ_VAL(obj, 0) == -1))
 	send_to_char(ch, "It is empty.\r\n");
       else {
         if (GET_OBJ_VAL(obj, 0) < 0)
diff --git a/src/oedit.c b/src/oedit.c
index 0aafb3c..cacef69 100644
--- a/src/oedit.c
+++ b/src/oedit.c
@@ -444,12 +444,15 @@ static void oedit_disp_val1_menu(struct descriptor_data *d)
   case ITEM_MONEY:
     write_to_output(d, "Number of gold coins : ");
     break;
-  case ITEM_NOTE:
   case ITEM_FURNITURE:
     write_to_output(d, "Number of people it can hold : ");
     break;
-  default:
+  case ITEM_NOTE:
     oedit_disp_menu(d);
+    break;
+  default:
+    mudlog(BRF, LVL_BUILDER, TRUE, "SYSERR: OLC: Reached default case in oedit_disp_val1_menu()!");
+    break;
   }
 }
 
diff --git a/src/qedit.c b/src/qedit.c
index 60744c2..48b1259 100644
--- a/src/qedit.c
+++ b/src/qedit.c
@@ -342,10 +342,9 @@ static void qedit_disp_menu(struct descriptor_data *d)
                   obj_proto[real_object(quest->prereq)].short_description,
     quest->value[4],
     quest->next_quest == NOTHING ? -1 : quest->next_quest,
-    quest->next_quest == NOTHING ? "" : QST_DESC(real_quest(quest->next_quest)),
+    real_quest(quest->next_quest) == NOTHING ? "" : QST_DESC(real_quest(quest->next_quest)),
     quest->prev_quest == NOTHING ? -1 : quest->prev_quest,
-    quest->prev_quest == NOTHING ? "" : QST_DESC(real_quest(quest->prev_quest))
-  );
+    real_quest(quest->prev_quest) == NOTHING ? "" : QST_DESC(real_quest(quest->prev_quest)));
   OLC_MODE(d) = QEDIT_MAIN_MENU;
 }
 /* For sector type.  */