diff --git a/.gitignore b/.gitignore
index 9d49d56..b3043cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 .settings/
 bin/
 .project
-config.txt
\ No newline at end of file
+config.txt
+dist/
+testApi/
diff --git a/src/be/jeffcheasey88/peeratcode/routes/BadgeDetails.java b/src/be/jeffcheasey88/peeratcode/routes/BadgeDetails.java
index fd9a4b1..92ef735 100644
--- a/src/be/jeffcheasey88/peeratcode/routes/BadgeDetails.java
+++ b/src/be/jeffcheasey88/peeratcode/routes/BadgeDetails.java
@@ -34,10 +34,10 @@ public class BadgeDetails implements Response {
 			JSONObject badgeJSON = new JSONObject();
 			if (badge != null) {
 				badgeJSON.put("name", badge.getName());
-				if(badge.getLogo() != null) badgeJSON.put("logo", new String(Base64.getEncoder().encode(badge.getLogo())));
+				if(badge.getLogo() != null) badgeJSON.put("logo", Base64.getEncoder().encodeToString(badge.getLogo()));
 				badgeJSON.put("level", badge.getLevel());
 			}
-			writer.write(badgeJSON.toJSONString());
+			writer.write(badgeJSON.toJSONString().replace("\\", ""));
 		}
 		else {
 			HttpUtil.responseHeaders(writer, 400, "Access-Control-Allow-Origin: *");
diff --git a/src/be/jeffcheasey88/peeratcode/routes/Leaderboard.java b/src/be/jeffcheasey88/peeratcode/routes/Leaderboard.java
index 3178b7a..5f744bd 100644
--- a/src/be/jeffcheasey88/peeratcode/routes/Leaderboard.java
+++ b/src/be/jeffcheasey88/peeratcode/routes/Leaderboard.java
@@ -34,14 +34,14 @@ public class Leaderboard implements Response {
 				JSONObject playerJSON = new JSONObject();
 				playerJSON.put("pseudo", player.getPseudo());
 				playerJSON.put("group", player.getGroup());
-				if(player.getAvatar() != null) playerJSON.put("avatar", new String(Base64.getEncoder().encode(player.getAvatar())));
+				if(player.getAvatar() != null) playerJSON.put("avatar", Base64.getEncoder().encodeToString(player.getAvatar()));
 				playerJSON.put("score", player.getTotalScore());
 				playerJSON.put("completions", player.getTotalCompletion());
 				playerJSON.put("tries", player.getTotalTries());
 				playersJSON.add(playerJSON);
 			}
 		}
-		writer.write(playersJSON.toJSONString());
+		writer.write(playersJSON.toJSONString().replace("\\", ""));
 	}
 
 	@Override
diff --git a/src/be/jeffcheasey88/peeratcode/routes/PlayerDetails.java b/src/be/jeffcheasey88/peeratcode/routes/PlayerDetails.java
index 2b6f0f2..8554170 100644
--- a/src/be/jeffcheasey88/peeratcode/routes/PlayerDetails.java
+++ b/src/be/jeffcheasey88/peeratcode/routes/PlayerDetails.java
@@ -46,8 +46,8 @@ public class PlayerDetails implements Response {
 			playerJSON.put("completions", player.getTotalCompletion());
 			playerJSON.put("tries", player.getTotalTries());
 			playerJSON.put("badges", player.getBadges());
-			if(player.getAvatar() != null) playerJSON.put("avatar", new String(Base64.getEncoder().encode(player.getAvatar())));
-			writer.write(playerJSON.toJSONString());
+			if(player.getAvatar() != null) playerJSON.put("avatar", Base64.getEncoder().encodeToString(player.getAvatar()));
+			writer.write(playerJSON.toJSONString().replace("\\", ""));
 		} else {
 			HttpUtil.responseHeaders(writer, 400, "Access-Control-Allow-Origin: *");
 		}
@@ -55,6 +55,6 @@ public class PlayerDetails implements Response {
 
 	@Override
 	public Pattern getPattern() {
-		return Pattern.compile("^\\/player\\/(.+)?$");
+		return Pattern.compile("^\\/player\\/?(.+)?$");
 	}
 }