diff --git a/package.json b/package.json
index c96648c..26362a7 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,8 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/kern/filepizza",
   "scripts": {
-    "start": "node ./dist/index.js",
+    "start": "babel-node ./src/index.js",
+    "start:prod": "node ./dist/index.js",
     "build": "babel src --ignore __tests__,__mocks__ --out-dir dist && webpack -p ./src/client && rm -rf dist/static && cp -R src/static dist/static"
   },
   "repository": {
diff --git a/src/db.js b/src/db.js
index ca70096..53871fb 100644
--- a/src/db.js
+++ b/src/db.js
@@ -14,7 +14,7 @@ tokenGenerator.initWithWordList(toppings)
 export function create(socket) {
 
   return tokenGenerator.generate(TOKEN_OPTIONS).then((parts) => {
-    const token = parts.join('-')
+    const token = parts.join('/')
     let result = {
       token: token,
       socket: socket
diff --git a/src/middleware/bootstrap.js b/src/middleware/bootstrap.js
index 68f93cb..c4051b4 100644
--- a/src/middleware/bootstrap.js
+++ b/src/middleware/bootstrap.js
@@ -3,7 +3,7 @@ var express = require('express')
 
 var routes = module.exports = new express.Router()
 
-routes.get(/^\/([a-z]+-[a-z]+-[a-z]+-[a-z]+)$/, function (req, res, next) {
+routes.get(/^\/([a-z]+\/[a-z]+\/[a-z]+\/[a-z]+)$/, function (req, res, next) {
 
   var uploader = db.find(req.params[0])
   if (uploader) {
diff --git a/src/routes.js b/src/routes.js
index 5e5e2e7..28b23f5 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -9,7 +9,7 @@ import ErrorPage from './components/ErrorPage'
 export default (
   <Route handler={App}>
     <DefaultRoute handler={UploadPage} />
-    <Route name="download" path="/:a-:b-:c-:d" handler={DownloadPage} />
+    <Route name="download" path="/:a/:b/:c/:d" handler={DownloadPage} />
     <Route name="error" path="error" handler={ErrorPage} />
     <NotFoundRoute handler={ErrorPage} />
   </Route>