diff --git a/dist/index.html b/dist/index.html
index 1abf4612..a2887e0a 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -19,7 +19,7 @@
     <script type="text/javascript">
 	$(function () {
 	    window.swaggerUi = new SwaggerUi({
-                discoveryUrl:"http://petstore.swagger.wordnik.com/api/api-docs.json",
+                discoveryUrl:"http://localhost:8002/api/api-docs",
                 apiKey:"special-key",
                 dom_id:"swagger-ui-container",
                 supportHeaderParams: false,
diff --git a/dist/lib/swagger.js b/dist/lib/swagger.js
index fc40c5d8..0ce1513e 100644
--- a/dist/lib/swagger.js
+++ b/dist/lib/swagger.js
@@ -63,7 +63,11 @@
           }
           _this.basePath = _this.basePath.replace(/\/$/, '');
         } else {
-          _this.basePath = _this.discoveryUrl.substring(0, _this.discoveryUrl.lastIndexOf('/'));
+          if (_this.discoveryUrl.indexOf('?') > 0) {
+            _this.basePath = _this.discoveryUrl.substring(0, _this.discoveryUrl.lastIndexOf('?'));
+          } else {
+            _this.basePath = _this.discoveryUrl;
+          }
           log('derived basepath from discoveryUrl as ' + _this.basePath);
         }
         _this.apis = {};
@@ -201,6 +205,7 @@
       parts = this.path.split("/");
       this.name = parts[parts.length - 1].replace('.{format}', '');
       this.basePath = this.api.basePath;
+      console.log('bp: ' + this.basePath);
       this.operations = {};
       this.operationsArray = [];
       this.modelsArray = [];
@@ -215,6 +220,8 @@
           this.api.fail("SwaggerResources must have a path.");
         }
         this.url = this.api.suffixApiKey(this.api.basePath + this.path.replace('{format}', 'json'));
+        console.log('basePath: ' + this.api.basePath);
+        console.log('url: ' + this.url);
         this.api.progress('fetching resource ' + this.name + ': ' + this.url);
         jQuery.getJSON(this.url, function(response) {
           var endpoint, _i, _len, _ref;
@@ -279,6 +286,9 @@
           if (o.errorResponses) {
             errorResponses = o.errorResponses;
           }
+          if (o.method) {
+            o.httpMethod = o.method;
+          }
           op = new SwaggerOperation(o.nickname, resource_path, o.httpMethod, o.parameters, o.summary, o.notes, o.responseClass, errorResponses, this, o.consumes, o.produces);
           this.operations[op.nickname] = op;
           _results.push(this.operationsArray.push(op));