diff --git a/.gitignore b/.gitignore
index bf1ba79..4ff9ef8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -148,4 +148,7 @@ node_modules
 .lock-wscript
 
 ### Webpack
-dist/
\ No newline at end of file
+dist/
+
+### OS X files
+/**/.DS_Store
diff --git a/src/game_board/game_board.html b/src/game_board/game_board.html
index 04b4799..0a681ce 100644
--- a/src/game_board/game_board.html
+++ b/src/game_board/game_board.html
@@ -12,9 +12,9 @@
                     ng-class="{'selected': info.selected, 'targetable': doingAction && targets.indexOf(info.id) !== -1}">{{info.name}}</h4>
                 <ul style="list-style: none outside none; margin: 0; padding: 0;">
                     <li ng-repeat="(name, value) in info.properties">
-                        <b>{{name}}</b>: {{value}}
+                        <b>{{name | formatResourceName}}</b>: {{value}}
                     </li>
-                    <li><b>CARDS: </b>{{info.zones.Hand.length()}}</li>
+                    <li><b>Cards: </b>{{info.zones.Hand.length()}}</li>
                 </ul>
                 <!-- Action buttons -->
                 <div class="player-actions">
diff --git a/src/game_board/module.js b/src/game_board/module.js
index 4ad9b28..096f1b4 100644
--- a/src/game_board/module.js
+++ b/src/game_board/module.js
@@ -62,4 +62,10 @@ module.exports = angular.module('cardshifter.gameBoard', [ngRoute, ngAnimate, se
         replace: true,
         template: require('../card_model/card_template.html')
     };
+  })
+  .filter('formatResourceName', function() {
+      return function(input, scope) {
+          input = input.replace(/_/g, ' ');
+          return input.substring(0, 1).toUpperCase() + input.substring(1).toLowerCase();
+      }
   });
diff --git a/src/server_interface/server_interface.js b/src/server_interface/server_interface.js
index de898d6..21a1224 100644
--- a/src/server_interface/server_interface.js
+++ b/src/server_interface/server_interface.js
@@ -1,7 +1,7 @@
 'use strict';
 
 // checks if the string begins with either ws:// or wss://
-var wsProtocolFinder = /ws(s)*:\/\//;
+var wsProtocolFinder = /ws(s)?:\/\//;
 var SOCKET_OPEN = 1;
 
 var MAIN_LOBBY = 1;