diff --git a/build.gradle b/build.gradle
index 8503f9b4..17038016 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,20 +10,21 @@ buildscript {
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
     buildToolsVersion '23.0.2'
-    compileOptions {
-        // Use Java 1.7, requires minSdk 8
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+    compileSdkVersion 23
+    defaultConfig {
+        minSdkVersion 9
+        targetSdkVersion 22 //Bumping to 23 means we have to support the new permissions model
+        multiDexEnabled true
     }
     dexOptions {
         javaMaxHeapSize "4g"
     }
-    defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 22
-        multiDexEnabled true
+    compileOptions {
+        // Use Java 1.7, requires minSdk 8
+        //SSHD requires mina when running on JDK < 7
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
     }
 	sourceSets {
         main {
@@ -51,7 +52,7 @@ android {
         checkReleaseBuilds false
     }
     buildTypes {
-        release {
+        release { //keep on 'releae', set to 'all' when testing to make sure proguard is not deleting important stuff
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'),'proguard-rules.pro'
         }
@@ -62,11 +63,11 @@ dependencies {
     repositories {
         mavenCentral()
     }
-    compile 'com.android.support:support-v4:23.2.0'
-    compile 'com.android.support:appcompat-v7:23.2.0'
-    compile 'com.android.support:design:23.2.0'
+    compile 'com.android.support:support-v4:23.2.1'
+    compile 'com.android.support:appcompat-v7:23.2.1'
+    compile 'com.android.support:design:23.2.1'
 
-    compile 'org.apache.sshd:sshd-core:0.8.0'
+    compile 'org.apache.sshd:sshd-core:0.8.0' //0.9 seems to fail on Android 6 and 1.+ requires java.nio.file, which doesn't exist in Android
     //compile 'org.bouncycastle:bcprov-jdk15on:1.54'
 
     compile 'com.madgag.spongycastle:pkix:1.54.0.0'