diff --git a/projects/android/.classpath b/projects/android/.classpath
index 6efcbb7..4160c21 100644
--- a/projects/android/.classpath
+++ b/projects/android/.classpath
@@ -3,5 +3,6 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/projects/android/default.properties b/projects/android/default.properties
deleted file mode 100644
index e2e8061..0000000
--- a/projects/android/default.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-8
diff --git a/projects/android/src/org/safermobile/intheclear/ITCConstants.java b/projects/android/src/org/safermobile/intheclear/ITCConstants.java
index 7eedb16..edebc82 100644
--- a/projects/android/src/org/safermobile/intheclear/ITCConstants.java
+++ b/projects/android/src/org/safermobile/intheclear/ITCConstants.java
@@ -165,6 +165,7 @@ public static class CALENDAR {
 				"sync_events"
 			};
 		}
+		
 	}
 	
 	public static class Duriation {
diff --git a/projects/android/src/org/safermobile/intheclear/Wizard.java b/projects/android/src/org/safermobile/intheclear/Wizard.java
index a41b115..7130dc3 100644
--- a/projects/android/src/org/safermobile/intheclear/Wizard.java
+++ b/projects/android/src/org/safermobile/intheclear/Wizard.java
@@ -345,7 +345,16 @@ public WizardForm(Context c, int wNum, int[] screen) {
 				
 				break;
 			case 2:
+				
+				// TODO
+				// for avd testing allow skipping this screen
+				
+				
 				wizardForward.setEnabled(false);
+				// wizardForward.setEnabled(true);
+				
+				
+				
 				LinearLayout ynHolder = new LinearLayout(c);
 				ynHolder.setLayoutParams(lp);
 				ynHolder.setOrientation(LinearLayout.HORIZONTAL);
diff --git a/projects/android/src/org/safermobile/intheclear/data/PIMWiper.java b/projects/android/src/org/safermobile/intheclear/data/PIMWiper.java
index 3b148b0..0cfba7f 100644
--- a/projects/android/src/org/safermobile/intheclear/data/PIMWiper.java
+++ b/projects/android/src/org/safermobile/intheclear/data/PIMWiper.java
@@ -437,10 +437,10 @@ else if(file.isDirectory() && file.canRead())
 		// remove this folder (if it's not the SDCard, naturally)
 		// if, for some reason, the folder was not fully emptied,
 		// this will fail.  so do it again.
-		/*
+		
 		if(folder.getPath().compareTo(FolderIterator.pathToSDCard.toString()) != 0)
 			if(!folder.delete())
 				wipeFolder(folder);
-		*/
+		
 	}
 }
\ No newline at end of file
diff --git a/projects/android/src/org/safermobile/utils/FolderIterator.java b/projects/android/src/org/safermobile/utils/FolderIterator.java
index b926992..f74118e 100644
--- a/projects/android/src/org/safermobile/utils/FolderIterator.java
+++ b/projects/android/src/org/safermobile/utils/FolderIterator.java
@@ -18,9 +18,23 @@ public class FolderIterator {
 	private static SharedPreferences _sp;
 		
 	public FolderIterator() {
-		pathToSDCard = Environment.getExternalStorageDirectory();
+		File external_sd =new File("/mnt/sdcard/external_sd/");
+		File extSdCard = new File("/mnt/extSdCard/");
+		File emmc = new File("/mnt/emmc/");
+		
+		if(external_sd.exists() && external_sd.list().length>0) {
+			pathToSDCard = external_sd;
+		}else if (extSdCard.exists() && extSdCard.list().length>0){
+			pathToSDCard = extSdCard;
+		}else if (emmc.exists() && emmc.list().length>0){
+			pathToSDCard = emmc;
+		}else{
+			pathToSDCard = Environment.getExternalStorageDirectory();
+		}
 	}
 	
+	
+	
 	public static ArrayList<File> getFoldersOnSDCard() {
 		File[] folder = pathToSDCard.listFiles();
 		ArrayList<File> folders = new ArrayList<File>();