diff --git a/psGrammar/dictionary/tobiDic.dic b/psGrammar/dictionary/tobiDic.dic
index 1e7d8db9634ac00a2aad866d791ce1ccecfd4f74..3823bd44a37e919c2b4441e4de42c15feb5556f9 100644
--- a/psGrammar/dictionary/tobiDic.dic
+++ b/psGrammar/dictionary/tobiDic.dic
@@ -63,7 +63,6 @@
 ;semi-colon(2)	S EH M IH K OW L AH N
 ?question-mark	K W EH S CH AH N M AA R K
 a	AH
-an	AH N
 a's	EY Z
 a(2)	EY
 a.	EY
@@ -6094,7 +6093,7 @@ asimov	AE S IH M AA V
 asimov's	AE S IH M AA V Z
 asimov's(2)	AE Z IH M AA V Z
 asimov(2)	AE Z IH M AA V
-asimov(3)	AE S IH M OH
+asimov(3)	AE S IH M OW
 asimow	AE S IH M OW
 asinine	AE S AH N AY N
 ask	AE S K
@@ -6503,6 +6502,7 @@ atlantis'(2)	AE T L AE N T IH S IH Z
 atlantis's	AE T L AE N T IH S IH Z
 atlantis(2)	AE T L AE N IH S
 atlas	AE T L AH S
+atlas(2)	AH T L AH S
 atlas's	AE T L AH S IH Z
 atlases	AE T L EY S IH Z
 atlases(2)	AE T L AH S IH Z
@@ -20974,6 +20974,7 @@ chococrispies    CH AO K AO K R IH S P IY S
 chocolat	CH AA K L AH T
 chocolate	CH AO K L AH T
 chocolate_cookies	CH AO K L AH T K UH K IY Z
+chocolate_jello	CH AO K L AH T JH EH L OW
 chocolate_milk	CH AO K L AH T M IH L K
 chocolatemilk	CH AO K L AH T M IH L K
 chocolates	CH AO K L AH T S
@@ -22625,6 +22626,7 @@ coffaro	K OW F AA R OW
 coffe	K AA F IY
 coffee	K AA F IY
 coffee_table	K AA F IY T EY B AH L
+coffee_grounds	K AA F IY G R AW N D Z
 coffeecup	K AA F IY K AH P
 coffeepads	K AA F IY P AE D Z
 coffee's	K AA F IY Z
@@ -25266,6 +25268,7 @@ cornfeld	K AO R N F EH L D
 cornfield	K AO R N F IY L D
 cornfields	K AO R N F IY L D Z
 cornflakes	K AO R N F L EY K S
+cornflakes(2)	K AO R N F L AY K S
 cornflower	K AO R N F L AW ER
 cornflowers	K AO R N F L AW ER Z
 cornforth	K AO R N F ER TH
@@ -25392,7 +25395,7 @@ corrib	K AO R IH B
 corrick	K AO R IH K
 corridor	K AO R AH D ER
 corridor(2)	K AO R IH D ER
-corridor(3)	1K AA R IH D AO
+corridor(3)	K AA R IH D AO
 corridor(4)	K AO R IH D AO
 corridors	K AO R IH D ER Z
 corridors(2)	K AO R AH D ER Z
@@ -32517,7 +32520,6 @@ discriminating	D IH S K R IH M AH N EY T IH NG
 discrimination	D IH S K R IH M AH N EY SH AH N
 discriminative	D IH S K R IH M AH N AH T IH V
 discriminatory	D IH S K R IH M AH N AH T AO R IY
-disc	D IH S K
 discs	D IH S K S
 discursive	D IH S K ER S IH V
 discus	D IH S K AH S
@@ -32586,6 +32588,7 @@ disgusts	D IH S G AH S T S
 disgusts(2)	D IH S G AH S S
 disgusts(3)	D IH S G AH S
 dish	D IH SH
+dish_soap	D IH SH S OW P
 disharmony	D IH S HH AA R M AH N IY
 disharoon	D IH SH ER UW N
 dishaw	D IH SH AO
@@ -39339,8 +39342,8 @@ eveland	IY V L AH N D
 eveleth	EH V IH L IH TH
 evelina	EH V EH L IY N AH
 eveline	EH V AH L IH N
-evelyn	EH V AH L AH N
-evelyn(2)	EH V AH L IH N
+evelyn	EH V EH L EH N
+evelyn(2)	EH V EH L IH N
 even	IY V IH N
 evendale	EH V AH N D EY L
 evened	IY V AH N D
@@ -52520,6 +52523,9 @@ harped	HH AA R P T
 harpel	HH AA R P EH L
 harpenau	HH AA R P IH N OW
 harper	HH AA R P ER
+harper(2)	HH AH R P ER
+harper(3)	HH AA R P AH
+harper(4)	HH AH R P AH
 harper's	HH AA R P ER Z
 harpercollins	HH AA R P ER K AO L IH N Z
 harpers	HH AA R P ER Z
@@ -57737,6 +57743,8 @@ iceskating	AY S S K EY T IH NG
 iceskating(2)	AY S K EY T IH NG
 icetea AY S T IY
 ice-tea AY S T IY
+ice_tea AY S T IY
+ice_tea(2) IY S T IY
 ich	IH CH
 ichi	IY CH IY
 ichikawa	IH CH IY K AA W AH
@@ -61593,6 +61601,7 @@ jayashankar	JH AY AH SH AA NG K AA R
 jaycee	JH EY S IY
 jaycees	JH EY S IY Z
 jaycox	JH EY K AA K S
+jayden	JH EY D EH N
 jaye	JH EY
 jayewardene	JH EY W AO R D IY N
 jayhawker	JH EY HH AO K ER
@@ -68277,6 +68286,7 @@ laundries	L AO N D R IY Z
 laundromat	L AO N D R AH M AE T
 laundromats	L AO N D R AH M AE T S
 laundry	L AO N D R IY
+laundry_cleaner	L AO N D R IY K L IY N ER
 launer	L AO N ER
 launius	L AW N IY IH S
 lauper	L AW P ER
@@ -83894,6 +83904,7 @@ noaa	N OW AH
 noaa(2)	EH N OW EY EY
 noack	N OW K
 noah	N OW AH
+noah(2)	N OW AA
 noah's	N OW AH Z
 noakes	N OW K S
 noam	N OW M
@@ -89592,6 +89603,7 @@ pealer	P IY L ER
 peanut	P IY N AH T
 peanut_bits	P IY N AH T B IH T S
 peanut_butter	P IY N AH T B AH T ER
+peanut_puffs	P IY N AH T P AH F S
 peanutbutter	P IY N AH T B AH T ER
 peanuts	P IY N AH T S
 peapack	P IY P AE K
@@ -99724,6 +99736,7 @@ remerchandise	R IY M ER CH AH N D AY Z
 remerchandised	R IY M ER CH AH N D AY Z D
 remerci	R IH M ER S IY
 remi	R EH M IY
+remi(2)	R EH M IH
 remic	R EH M IH K
 remick	R EH M IH K
 remics	R EH M IH K S
@@ -101651,6 +101664,7 @@ riggsbee	R IH G Z B IY
 righetti	R IY G EH T IY
 righi	R IY G IY
 right	R AY T
+right(2)	 R IH G T
 right_bookcase	R AY T B UH K K EY S
 right_beside_table	R AY T B IH S AY D T EY B AH L
 right_armchair	R AY T AA R M CH EH R
@@ -101718,6 +101732,9 @@ rile	R AY L
 riled	R AY L D
 riles	R AY L Z
 riley	R AY L IY
+riley(2)	R AY L IH
+riley(3)	R IY L IY
+riley(4)	R IY L IH
 riley's	R AY L IY Z
 rill	R IH L
 rill's	R IH L Z
@@ -102012,6 +102029,8 @@ rivenbark	R IH V IH N B AA R K
 rivenburg	R IH V AH N B ER G
 rivenburgh	R IH V IH N B ER G
 river	R IH V ER
+river(2)	R IH V AA
+river(3)	R IH V AH
 river's	R IH V ER Z
 rivera	R IH V EH R AH
 riverbank	R IH V ER B AE NG K
@@ -113306,6 +113325,7 @@ spomer	S P OW M ER
 sponaugle	S P AA N AO G AH L
 spong	S P AO NG
 sponge	S P AH N JH
+sponge_cloth	S P AH N JH K L AO TH
 sponged	S P AH N JH D
 spongeform	S P AH N JH F AO R M
 sponges	S P AH N JH AH Z
@@ -115514,6 +115534,7 @@ stravinsky's	S T R AH V IH N S K IY Z
 straw	S T R AO
 strawberries	S T R AO B EH R IY Z
 strawberry	S T R AO B EH R IY
+strawberry_jello	S T R AO B EH R IY JH EH L OW
 strawbridge	S T R AO B R IH JH
 strawder	S T R AO D ER
 strawderman	S T R AO D ER M AH N
@@ -116434,6 +116455,8 @@ suffused	S AH F Y UW Z D
 suffuses	S AH F Y UW Z IH Z
 suffusing	S AH F Y UW Z IH NG
 sugar	SH UH G ER
+sugar(2)	SH UH G AA
+sugar(3)	SH UH G AH
 sugar's	SH UH G ER Z
 sugarcane	SH UH G ER K EY N
 sugared	SH UH G ER D
@@ -121089,6 +121112,9 @@ tomato_sauce	T AH M EY T OW S AO S
 tomato_sauce(2)	T AH M AA T OW S AO S
 tomatosauce	T AH M EY T OW S AO S
 tomatosauce(2)	T AH M AA T OW S AO S
+tomato_soup	T AH M EY T OW S UW P
+tomato_soup(2)	T OH M EY T OW S UW P
+tomato_soup(3)	T OW M EY T OH S UW P
 tomatoe	T AH M EY T OW
 tomatoe(2)	T AH M AA T OW
 tomatoes	T AH M EY T OW Z
diff --git a/psGrammar/tasks/receptionist/getDrink.jsgf b/psGrammar/tasks/receptionist/getDrink.jsgf
index 9f71631f5e2365a911d9945937047dd749986685..62ec251a8660936e5f901b6b49d3fbb3652f8877 100644
--- a/psGrammar/tasks/receptionist/getDrink.jsgf
+++ b/psGrammar/tasks/receptionist/getDrink.jsgf
@@ -8,6 +8,6 @@ public <drinkstring> = [<prefix>] <drink> [<robot>];
 
 <ilike> = (i like);
 
-<drink> =  (tea) | (milk) | (hot chocolate);
+<drink> =  (apple juice) | (orange juice) | (coke) | (ice tea) | (fanta) |(milk);
 
 <robot> = (tobi) | (robot) | (biron) | (pepper);
diff --git a/psGrammar/tasks/receptionist/getName.jsgf b/psGrammar/tasks/receptionist/getName.jsgf
index d85f980bacd5ed08b4743adec6b4a3fd65bdca61..5cace881a83a18b26e0adce3afa0277b7f7a85be 100644
--- a/psGrammar/tasks/receptionist/getName.jsgf
+++ b/psGrammar/tasks/receptionist/getName.jsgf
@@ -10,6 +10,6 @@ public <namestring> = [<prefix>] <name> [<robot>];
 
 <callme> = (call me);
 
-<name> = (amelia) | (angel) | (ava) | (benjamin) | (boris) | (charlotte) | (elijah) | (emma) | (evelyn) | (henry) | (isabella) | (liam) | (lucas) | (luna) | (mia) | (noah) | (olivia) | (oliver) | (sophia) | (william);
+<name> = (kai) | (noah) | (unique) | (luca) | (evelyn) | (jayden) | (james) | (riley) | (harper) | (quinn) | (avery) | (remi) | (river) | (atlas);
 
 <robot> = (tobi) | (robot) | (tiago);
diff --git a/psGrammar/tasks/restaurant/order_apartment.jsgf b/psGrammar/tasks/restaurant/order_apartment.jsgf
index f7621533c1a5cfce0e94536411c3d6e24f42f70c..d52a74fe2426b344b29ec9ce1e1d1f78c7a72b28 100644
--- a/psGrammar/tasks/restaurant/order_apartment.jsgf
+++ b/psGrammar/tasks/restaurant/order_apartment.jsgf
@@ -3,16 +3,22 @@ grammar ordering;
 
 public <restaurant> = ([tobi] [(i want) | (bring me)] [one | a ] <objects> [please]);
 
-<objects> = (<drinks> | <food>);
+<objects> = (<drinks> | <food> | <fruits> | <snacks>);
 
-<food> =  ((tuna) |
-    (tomato soup) | 
+<food> =  (
+    (tuna) |
+    (cornflakes) | 
     (spam) | 
     (mustard) |
     (strawberry jello)|
     (chocolate jello) | 
-    (coffe grounds) |
+    (ketchup) |
     (sugar) |
+    (coffee grounds)|
+    (corn)|
+    (tomato soup));
+    
+<fruits> = (
     (pear) | 
     (plum) | 
     (peach) |
@@ -21,5 +27,12 @@ public <restaurant> = ([tobi] [(i want) | (bring me)] [one | a ] <objects> [plea
     (strawberry) |
     (banana) |
     (apple));
-    
-<drinks> = ((red wine) | (wine) | (juice pack) | (cola) | (coke) | (tropical juice) | (milk) | (iced tea) | (orange juice));
+
+<snacks> =  (
+    (cheezit) |
+    (nuts) | 
+    (pretzels) | 
+    (peanut puffs) |
+    (pringles));
+
+<drinks> = ((apple juice) | (orange juice) | (coke) | (ice tea) | (fanta) |(milk));