diff --git a/public/assets/icon/apple-icon.png b/public/assets/icon/apple-icon.png
index 76cbd40..c860c9d 100644
Binary files a/public/assets/icon/apple-icon.png and b/public/assets/icon/apple-icon.png differ
diff --git a/public/assets/icon/icon.png b/public/assets/icon/icon.png
index 3605a05..a9191ae 100644
Binary files a/public/assets/icon/icon.png and b/public/assets/icon/icon.png differ
diff --git a/src/components/About.tsx b/src/components/About.tsx
index 555aacd..631bec6 100644
--- a/src/components/About.tsx
+++ b/src/components/About.tsx
@@ -15,7 +15,7 @@ const About: React.FC<AboutProps> = ({ pane }) => {
     <IonGrid style={{ display: pane === 'about' ? null : 'none' }} class="about-grid">
       <IonRow>
         <IonCol>
-          <span>Any feedback is welcome! </span>
+          <span>Any feedback, questions, or issues? </span>
           <span role="img" aria-label="Turtle">
             🐢🐢
           </span>
diff --git a/src/pages/Room.tsx b/src/pages/Room.tsx
index 7ba44f1..078bd0b 100644
--- a/src/pages/Room.tsx
+++ b/src/pages/Room.tsx
@@ -60,7 +60,7 @@ const Room: React.FC<RouteComponentProps<{ roomId: string }>> = ({ match }) => {
     if (userId !== '' && validRoom) {
       const populateRoom = () => {
         const roomRef = rtdb.ref('/rooms/' + roomId);
-        const availableRef = rtdb.ref('/available/');
+        const availableRef = rtdb.ref('/available/' + roomId);
 
         // Keep track of online user presence in realtime database rooms
         roomRef.on('value', async (snapshot) => {
@@ -105,8 +105,8 @@ const Room: React.FC<RouteComponentProps<{ roomId: string }>> = ({ match }) => {
         // Unsubscribe listeners
         return () => {
           roomRef.off('value');
+          rtdb.ref('.info/connected').off('value');
           roomRef.child('userCount').off('value');
-          availableRef.off('child_removed');
         };
       };
 
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index 0e05329..3971430 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -4,12 +4,19 @@ const adjectives = [
   'Adamant',
   'Adorable',
   'Anxious',
+  'Awesome',
+  'Barbarous',
   'Bent',
   'Bright',
+  'Careful',
+  'Clean',
   'Coherent',
   'Curious',
   'Diligent',
+  'Disastrous',
   'Earthy',
+  'Erratic',
+  'Famous',
   'Fascinated',
   'Foreign',
   'Hateful',
@@ -22,35 +29,48 @@ const adjectives = [
   'Naughty',
   'Neat',
   'Nifty',
+  'Nostalgic',
   'Parallel',
   'Quack',
+  'Questionable',
   'Roomy',
   'Sedate',
   'Sharp',
   'Silent',
+  'Terrible',
   'Unequal',
 ];
 
 const animals = [
-  'Chimpanzee',
+  'Ape',
+  'Basilisk',
   'Bison',
-  'Squirrel',
-  'Lemur',
-  'Wolf',
-  'Dingo',
+  'Chameleon',
+  'Chimpanzee',
+  'Chinchilla',
+  'Chipmunk',
   'Colt',
-  'Seal',
   'Cougar',
-  'Ram',
-  'Parakeet',
+  'Cow',
+  'Dingo',
+  'Fawn',
+  'Fish',
   'Goat',
-  'Ape',
-  'Basilisk',
-  'Oryx',
   'Iguana',
-  'Stallion',
   'Jackal',
+  'Lemur',
+  'Lion',
+  'Moose',
+  'Ocelot',
+  'Opossum',
+  'Oryx',
+  'Parakeet',
+  'Ram',
+  'Seal',
   'Snake',
+  'Squirrel',
+  'Stallion',
+  'Wolf',
   'Zebra',
 ];
 
@@ -69,8 +89,8 @@ const animals = [
 // };
 
 export const generateAnonName = (): string => {
-  const adj: string = adjectives[Math.floor(Math.random() * 30)];
-  const animal: string = animals[Math.floor(Math.random() * 20)];
+  const adj: string = adjectives[Math.floor(Math.random() * 40)];
+  const animal: string = animals[Math.floor(Math.random() * 30)];
   return adj + ' ' + animal;
 };