diff --git a/src/core/Core.js b/src/core/Core.js
index f0baae33d..93b3c346c 100644
--- a/src/core/Core.js
+++ b/src/core/Core.js
@@ -31,7 +31,6 @@ export default class Core {
     this.translator = new Translator({locales: this.opts.locales})
     this.i18n = this.translator.translate.bind(this.translator)
 
-    // Set up an event EventEmitter
     this.emitter = new ee.EventEmitter()
 
     this.state = {
@@ -40,9 +39,6 @@ export default class Core {
 
     // for debugging
     global.UppyState = this.state
-
-    // this.state.book = 'Harry Potter'
-    // global.UppyDefaultState = this.defaultState
   }
 
   /**
diff --git a/src/plugins/GoogleDrive.js b/src/plugins/GoogleDrive.js
index 985b4a4d9..9d0b5fb7b 100644
--- a/src/plugins/GoogleDrive.js
+++ b/src/plugins/GoogleDrive.js
@@ -7,7 +7,7 @@ export default class Google extends Plugin {
   constructor (core, opts) {
     super(core, opts)
     this.type = 'acquirer'
-    this.id = 'GoogleDriver'
+    this.id = 'GoogleDrive'
     this.titile = 'Google Drive'
     this.icon = yo`
       <svg class="UppyModalTab-icon" width="28" height="28" viewBox="0 0 16 16">
diff --git a/test/acceptance/multipart.spec.js b/test/acceptance/multipart.spec.js
index 0cea8f9e6..fe433667d 100644
--- a/test/acceptance/multipart.spec.js
+++ b/test/acceptance/multipart.spec.js
@@ -27,7 +27,7 @@ module.exports = function (driver, platform, host) {
     })
 
     function isUploaded () {
-      // .getText() only work on visible elements, so we use .getAttribute('textContent'), go figure
+      // .getText() only works on visible elements, so we use .getAttribute('textContent'), go figure
       // http://stackoverflow.com/questions/21994261/gettext-not-working-on-a-select-from-dropdown
       return driver.findElement(By.css('.UppyProgressBar .UppyProgressBar-percentage'))
         .getAttribute('textContent')
diff --git a/test/acceptance/saucelabs-dummy.spec.js b/test/acceptance/saucelabs-dummy.spec.js
index e7ce39656..b03d9bbfe 100644
--- a/test/acceptance/saucelabs-dummy.spec.js
+++ b/test/acceptance/saucelabs-dummy.spec.js
@@ -1,10 +1,11 @@
 var webdriver = require('selenium-webdriver')
 var remote = require('selenium-webdriver/remote')
 
-var username = process.env.USERNAME
-var accessKey = process.env.ACCESS_KEY
+var username = process.env.SAUCELABS_USERNAME
+var accessKey = process.env.SAUCELABS_ACCESS_KEY
 
-var platform = { browser: 'firefox', version: '34.0', os: 'Windows 7' }
+// var platform = { browser: 'firefox', version: '34.0', os: 'Windows 7' }
+var platform = { browser: 'Safari', version: '9.0', os: 'OS X 10.11' }
 
 function buildDriver (platform) {
   var driver = new webdriver
diff --git a/website/src/examples/multipart/app.html b/website/src/examples/multipart/app.html
index a74d872d1..e2d08cec6 100644
--- a/website/src/examples/multipart/app.html
+++ b/website/src/examples/multipart/app.html
@@ -1,12 +1,16 @@
 <!-- Basic Uppy styles -->
 <link rel="stylesheet" href="/uppy/uppy.css">
 
-<form class="UppyForm" action="//api2.transloadit.com">
+<form action="//api2.transloadit.com">
   <input type="file" name="files[]" multiple="">
-  <button type="submit">Upload</button>
+  <button type="submit">Dumb Fallback Form Upload</button>
 </form>
 
-<!-- <div class="grid">
+<div class="UppyForm">
+
+</div>
+
+<!--div class="grid">
   <div class="column-1-2">
     <form id="myform1">
       <input id="myfile1" type="file" name="myfile" multiple />
@@ -18,7 +22,7 @@
       <input id="myfile2" type="file" name="myfile" multiple />
     </form>
   </div>
-</div> -->
+</div-->
 
 <!-- <button id="myupload">
   Upload