diff --git a/Limelight/Utility/Computer.m b/Limelight/Utility/Computer.m
index 6a7cb22..fd8f543 100644
--- a/Limelight/Utility/Computer.m
+++ b/Limelight/Utility/Computer.m
@@ -28,4 +28,20 @@
     return self;
 }
 
+- (BOOL)isEqual:(id)object {
+    if ([object isKindOfClass:[Computer class]]) {
+        return [self.hostName isEqual:[object valueForKey:@"hostName"]];
+    } else {
+        return NO;
+    }
+}
+
+- (NSUInteger)hash {
+    NSUInteger prime = 31;
+    NSUInteger result = 1;
+    result = prime * result + (self.hostName == nil ? 0 : [self.hostName hash]);
+    
+    return result;
+}
+
 @end
diff --git a/Limelight/ViewControllers/MainFrameViewController.m b/Limelight/ViewControllers/MainFrameViewController.m
index 715cbaa..30be03e 100644
--- a/Limelight/ViewControllers/MainFrameViewController.m
+++ b/Limelight/ViewControllers/MainFrameViewController.m
@@ -171,18 +171,20 @@ static StreamConfiguration* streamConfig;
     // Change button color
     _settingsSidebarButton.tintColor = [UIColor colorWithRed:.2 green:.9 blue:0.f alpha:1.f];
     
-    // Set the side bar button action. When it's tapped, it'll show up the sidebar.
+    // Set the side bar button action. When it's tapped, it'll show the sidebar.
     _settingsSidebarButton.target = self.revealViewController;
     _settingsSidebarButton.action = @selector(revealToggle:);
     
     // Set the gesture
     [self.view addGestureRecognizer:self.revealViewController.panGestureRecognizer];
     
+    // Get callbacks associated with the viewController
     [self.revealViewController setDelegate:self];
     
     // Set the current position to the center
     currentPosition = FrontViewPositionLeft;
     
+    // Set up crypto
     _opQueue = [[NSOperationQueue alloc] init];
     [CryptoManager generateKeyPairUsingSSl];
     _uniqueId = [CryptoManager getUniqueID];