diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/Process.java b/src/main/java/org/qpython/qsl4a/qsl4a/Process.java
index 68ab1076a7cec501f0bf4c103a01bd3723bd7618..67becf3a08590f89581f9801f8d6415045af66e2 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/Process.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/Process.java
@@ -16,8 +16,6 @@
 
 package org.qpython.qsl4a.qsl4a;
 
-import android.content.Context;
-
 import org.qpython.qsl4a.codec.StreamGobbler;
 import org.qpython.qsl4a.qsl4a.interpreter.InterpreterConstants;
 
@@ -108,7 +106,7 @@ public class Process {
     return mIn;
   }
 
-  public void start(Context context, final Runnable shutdownHook) {
+  public void start(final Runnable shutdownHook) {
     if (isAlive()) {
       throw new RuntimeException("Attempted to start process that is already running.");
     }
@@ -119,19 +117,17 @@ public class Process {
 
     int[] pid = new int[1];
     String[] argumentsArray = mArguments.toArray(new String[mArguments.size()]);
-//    mLog = new File(String.format("%s/%s.log", InterpreterConstants.SDCARD_SL4A_ROOT, getName()));
-    mLog = new File(String.format("%s/%s.log", FileUtils.getRootPath(context.getApplicationContext()), getName()));
+    mLog = new File(String.format("%s/%s.log", InterpreterConstants.SDCARD_SL4A_ROOT, getName()));
 
     mFd =
         Exec.createSubprocess(binaryPath, argumentsArray, getEnvironmentArray(),
-            getWorkingDirectory(context), pid);
+            getWorkingDirectory(), pid);
     mPid.set(pid[0]);
     mOut = new FileOutputStream(mFd);
     mIn = new StreamGobbler(new FileInputStream(mFd), mLog, DEFAULT_BUFFER_SIZE);
     mStartTime = System.currentTimeMillis();
 
     new Thread(new Runnable() {
-      @Override
       public void run() {
         int result = Exec.waitFor(mPid.get());
         mEndTime = System.currentTimeMillis();
@@ -203,7 +199,7 @@ public class Process {
     mName = name;
   }
 
-  public String getWorkingDirectory(Context context) {
+  public String getWorkingDirectory() {
     return null;
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/ScriptLauncher.java b/src/main/java/org/qpython/qsl4a/qsl4a/ScriptLauncher.java
index 45dd43c84a34d8d0b87d32a6b84736a622543342..4bb294b27300fe1807fe0893b4720f0902b0f7b8 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/ScriptLauncher.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/ScriptLauncher.java
@@ -17,7 +17,6 @@
 package org.qpython.qsl4a.qsl4a;
 
 import android.app.Service;
-import android.content.Context;
 import android.content.Intent;
 
 
@@ -60,7 +59,7 @@ public class ScriptLauncher {
     return task;
   }
 
-  public static InterpreterProcess launchInterpreter(Context context, final AndroidProxy proxy, Intent intent,
+  public static InterpreterProcess launchInterpreter(final AndroidProxy proxy, Intent intent,
                                                      InterpreterConfiguration config, Runnable shutdownHook) {
     Interpreter interpreter;
     String interpreterName;
@@ -68,33 +67,33 @@ public class ScriptLauncher {
     interpreter = config.getInterpreterByName(interpreterName);
     InterpreterProcess process = new InterpreterProcess(interpreter, proxy);
     if (shutdownHook == null) {
-      process.start(context,new Runnable() {
+      process.start(new Runnable() {
         @Override
         public void run() {
           proxy.shutdown();
         }
       });
     } else {
-      process.start(context,shutdownHook);
+      process.start(shutdownHook);
     }
     return process;
   }
 
-  public static ScriptProcess launchScript(Context context,File script, InterpreterConfiguration configuration,
+  public static ScriptProcess launchScript(File script, InterpreterConfiguration configuration,
       final AndroidProxy proxy, Runnable shutdownHook) {
     if (!script.exists()) {
       throw new RuntimeException("No such script to launch.");
     }
     ScriptProcess process = new ScriptProcess(script, configuration, proxy);
     if (shutdownHook == null) {
-      process.start(context,new Runnable() {
+      process.start(new Runnable() {
         @Override
         public void run() {
           proxy.shutdown();
         }
       });
     } else {
-      process.start(context,shutdownHook);
+      process.start(shutdownHook);
     }
     return process;
   }
diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/facade/AndroidFacade.java b/src/main/java/org/qpython/qsl4a/qsl4a/facade/AndroidFacade.java
index 62991ca7c7c8c51d52c52c767b96856c304f2e13..fb219a19fad3351d2bc2530d7fd47c7febabb98c 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/facade/AndroidFacade.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/facade/AndroidFacade.java
@@ -17,36 +17,32 @@
 package org.qpython.qsl4a.qsl4a.facade;
 
 import android.annotation.SuppressLint;
-import android.app.AlertDialog;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
+import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.hardware.camera2.CameraCharacteristics;
-import android.hardware.camera2.CameraManager;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.os.Message;
 import android.os.StatFs;
 import android.os.Vibrator;
-import android.support.annotation.RequiresApi;
 import android.text.ClipboardManager;
-import android.text.InputType;
-import android.text.method.PasswordTransformationMethod;
-import android.widget.EditText;
 import android.widget.Toast;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 import org.qpython.qsl4a.QSL4APP;
-import org.qpython.qsl4a.qsl4a.FileUtils;
+import org.qpython.qsl4a.qsl4a.util.FileUtils;
 import org.qpython.qsl4a.qsl4a.FutureActivityTaskExecutor;
 import org.qpython.qsl4a.qsl4a.LogUtil;
 import org.qpython.qsl4a.qsl4a.NotificationIdFactory;
@@ -54,10 +50,10 @@ import org.qpython.qsl4a.qsl4a.future.FutureActivityTask;
 import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
 import org.qpython.qsl4a.qsl4a.rpc.Rpc;
 import org.qpython.qsl4a.qsl4a.rpc.RpcDefault;
-import org.qpython.qsl4a.qsl4a.rpc.RpcDeprecated;
 import org.qpython.qsl4a.qsl4a.rpc.RpcOptional;
 import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
-
+import org.qpython.qsl4a.qsl4a.util.HtmlUtil;
+import org.qpython.qsl4a.qsl4a.util.SPFUtils;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -66,11 +62,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.TimeZone;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.qpython.qsl4a.qsl4a.util.SPFUtils;
-
 /**
  * Some general purpose Android routines.<br>
  * <h2>Intents</h2> Intents are returned as a map, in the following form:<br>
@@ -98,8 +89,8 @@ public class AndroidFacade extends RpcReceiver {
     int getLogo48();
   }
 
-  private final Service mService;
-  private final Handler mHandler;
+  public final Service mService;
+  public final Handler mHandler;
   private final Intent mIntent;
   private final FutureActivityTaskExecutor mTaskQueue;
 
@@ -108,11 +99,11 @@ public class AndroidFacade extends RpcReceiver {
 
   private final Resources mResources;
   private ClipboardManager mClipboard = null;
-
-  //乘着船 修改
   public final Context context;
   public final String qpyProvider;
 
+  public static Handler handler;
+
   private final int intentFlags = Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_GRANT_READ_URI_PERMISSION  | Intent.FLAG_GRANT_WRITE_URI_PERMISSION ;
 
   @Override
@@ -138,11 +129,10 @@ public class AndroidFacade extends RpcReceiver {
     //乘着船 修改
     context = mService.getApplicationContext();
     qpyProvider = context.getPackageName() + ".provider";
-
   }
 
   ClipboardManager getClipboardManager() {
-    Object clipboard = null;
+    Object clipboard;
     if (mClipboard == null) {
       try {
         clipboard = mService.getSystemService(Context.CLIPBOARD_SERVICE);
@@ -203,6 +193,46 @@ public class AndroidFacade extends RpcReceiver {
     }
   }
 
+  Intent startActivityForResultCode(final Intent intent) {
+    FutureActivityTask<Intent> task = new FutureActivityTask<Intent>() {
+      @Override
+      public void onCreate() {
+        super.onCreate();
+        try {
+          int requestCode;
+          if (intent!=null){
+            requestCode=intent.getIntExtra("REQUEST_CODE",1024);
+          } else {
+            requestCode=2048;
+          }
+          startActivityForResult(intent, requestCode);
+        } catch (Exception e) {
+          if(intent!=null) {
+            intent.putExtra("EXCEPTION", e.getMessage());
+            setResult(intent);
+          }
+        }
+      }
+
+      @Override
+      public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (data==null)
+          data=new Intent();
+        data.putExtra("RESULT_CODE",resultCode);
+        setResult(data);
+      }
+    };
+    mTaskQueue.execute(task);
+
+    try {
+      return task.getResult();
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    } finally {
+      task.finish();
+    }
+  }
+
   // TODO(damonkohler): Pull this out into proper argument deserialization and support
   // complex/nested types being passed in.
   public static void putExtrasFromJsonObject(JSONObject extras, Intent intent) throws JSONException {
@@ -210,9 +240,9 @@ public class AndroidFacade extends RpcReceiver {
     for (int i = 0; i < names.length(); i++) {
       String name = names.getString(i);
       Object data = extras.get(name);
-      if (data == null) {
-        continue;
-      }
+      //if (data == null) {
+      //  continue;
+      //}
       if (data instanceof Integer) {
         intent.putExtra(name, (Integer) data);
       }
@@ -374,12 +404,12 @@ public class AndroidFacade extends RpcReceiver {
     }
   }
 
-  void startActivity(final Intent intent) {
+  void startActivity(final Intent intent) throws Exception {
     try {
       intent.setFlags(intent.getFlags() | intentFlags);
       context.startActivity(intent);
     } catch (Exception e) {
-      LogUtil.e("Failed to launch intent.", e);
+      throw new Exception("Failed to launch intent : "+ e);
     }
   }
 
@@ -463,6 +493,44 @@ public class AndroidFacade extends RpcReceiver {
     }
   }
 
+  public void doStartActivity(final Intent intent, Boolean wait,int flags) throws Exception {
+    if (wait == null || !wait) {
+      startActivity(intent);
+    } else {
+      FutureActivityTask<Intent> task = new FutureActivityTask<Intent>() {
+        private boolean mSecondResume = false;
+
+        @Override
+        public void onCreate() {
+          super.onCreate();
+          intent.setFlags(intent.getFlags() | intentFlags);
+          startActivity(intent);
+        }
+
+        @Override
+        public void onResume() {
+          if (mSecondResume) {
+            finish();
+          }
+          mSecondResume = true;
+        }
+
+        @Override
+        public void onDestroy() {
+          setResult(null);
+        }
+
+      };
+      mTaskQueue.execute(task,flags);
+
+      try {
+        task.getResult();
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      }
+    }
+  }
+
   /**
    * packagename and classname, if provided, are used in a 'setComponent' call.
    */
@@ -537,16 +605,26 @@ public class AndroidFacade extends RpcReceiver {
     mVibrator.vibrate(duration);
   }
 
-  @Rpc(description = "Displays a short-duration Toast notification.")
+  @Rpc(description = "Displays a Toast notification.")
   public void makeToast(@RpcParameter(name = "message") final String message,
-                        @RpcParameter(name = "length") @RpcDefault("0") final Integer length) {
-    mHandler.post(new Runnable() {
-      public void run() {
-        Toast.makeText(mService, message, length).show();
-      }
+                        @RpcParameter(name = "length") @RpcDefault("0") final Integer length,
+                        @RpcParameter(name = "isHtml") @RpcDefault("false") final Boolean isHtml) {
+    mHandler.post(() -> {
+      if(isHtml)
+          Toast.makeText(mService, HtmlUtil.textToHtml(message), length).show();
+      else
+          Toast.makeText(mService, message, length).show();
     });
   }
 
+  public void makeToast(final String message,final Integer length) {
+    makeToast(message,length,false);
+  }
+
+  public void makeToast(final String message) {
+    makeToast(message,0,false);
+  }
+
   /* 乘着船：过时删除
   private String getInputFromAlertDialog(final String title, final String message,
                                          final boolean password) {
@@ -610,29 +688,52 @@ public class AndroidFacade extends RpcReceiver {
 
   private static int NOTIFICATION_ID = 0x20002;//通知栏消息id
 
+  @SuppressLint("UnspecifiedImmutableFlag")
   @Rpc(description = "Displays a notification that will be canceled when the user clicks on it.")
   public void notify(
           @RpcParameter(name = "title", description = "title") final String title,
           @RpcParameter(name = "message") final String message,
-          @RpcParameter(name = "attachmentUri") @RpcOptional final String attachmentUri) {
+          @RpcParameter(name = "uri") @RpcOptional final String uri,
+          @RpcParameter(name = "arg") @RpcOptional final String arg) {
     // This contentIntent is a noop.
     Intent intent;
-
-    if (attachmentUri!=null) {
-      android.util.Log.d("AndroidFacade", "attachmentUri:"+attachmentUri);
-      if (attachmentUri.startsWith("http:") || attachmentUri.startsWith("https:")) {
-        intent = SPFUtils.getLinkAsIntent(context, attachmentUri);
+    PendingIntent contentIntent = null;
+    if (uri!=null) {
+      //android.util.Log.d("AndroidFacade", "attachmentUri:"+attachmentUri);
+      if (uri.startsWith("http:") || uri.startsWith("https:")) {
+        intent = SPFUtils.getLinkAsIntent(context, uri);
       } else {
+        if (uri.endsWith(".py")) {
+          try{
+            intent = new Intent (context,NotificationClickReceiver.class);
+            intent.putExtra("path",uri);
+            intent.putExtra("arg",arg);
+            contentIntent = PendingIntent.getBroadcast(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+          } catch (Exception e) {
+            intent = new Intent();
+            intent.setClassName(mService.getPackageName(), "org.qpython.qpylib.MPyApi");
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.setAction("org.qpython.qpylib.action.MPyApi");
+            Bundle mBundle = new Bundle();
+            mBundle.putString("app", SPFUtils.getCode(mService.getApplicationContext()));
+            mBundle.putString("act", "onPyApi");
+            mBundle.putString("flag", "api");
+            mBundle.putString("param", "fileapi");
+            mBundle.putString("pyfile", uri);
+            mBundle.putString("pyarg", arg);
+            intent.putExtras(mBundle);
+          }
+        } else {
         intent = new Intent();
-        intent.setClassName(context.getPackageName(), attachmentUri);
-
-      }
+        intent.setClassName(context.getPackageName(), uri);
+      }}
     } else {
       intent = new Intent();
     }
-    PendingIntent contentIntent = PendingIntent.getActivity(mService, NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+    if(contentIntent == null)
+        contentIntent = PendingIntent.getActivity(mService, NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
     Notification notification = SPFUtils.getNotification(context, title, message, contentIntent,
-            SPFUtils.getDrawableId(mService, "img_home_logo"), null, Notification.FLAG_AUTO_CANCEL);
+            SPFUtils.getDrawableId(mService, "img_home_logo"), null);
 
     // Get a unique notification id from the application.
     mNotificationManager.notify(NotificationIdFactory.create(), notification);
@@ -654,7 +755,7 @@ public class AndroidFacade extends RpcReceiver {
           @RpcParameter(name = "to", description = "A comma separated list of recipients.") final String to,
           @RpcParameter(name = "subject") final String subject,
           @RpcParameter(name = "body") final String body,
-          @RpcParameter(name = "attachmentUri") @RpcOptional final String attachmentUri) {
+          @RpcParameter(name = "attachmentUri") @RpcOptional final String attachmentUri) throws Exception {
     final Intent intent = new Intent(android.content.Intent.ACTION_SEND);
     intent.setType("plain/text");
     intent.putExtra(android.content.Intent.EXTRA_EMAIL, to.split(","));
@@ -742,7 +843,7 @@ public class AndroidFacade extends RpcReceiver {
     zone.put("offset", tz.getOffset((new Date()).getTime()));
     result.put("TZ", zone);
     result.put("SDK", android.os.Build.VERSION.SDK);
-    result.put("download", FileUtils.getExternalDownload(context).getAbsolutePath());
+    result.put("download", FileUtils.getExternalDownload().getAbsolutePath());
     result.put("appcache", mService.getCacheDir().getAbsolutePath());
     try {
       StatFs fs = new StatFs("/sdcard");
@@ -783,4 +884,17 @@ public class AndroidFacade extends RpcReceiver {
     return result;
   }
 
+  public static class NotificationClickReceiver extends BroadcastReceiver {
+    public NotificationClickReceiver(){}
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+      Message msg = new Message();
+      msg.obj = new String[]{
+              intent.getStringExtra("path"),
+              intent.getStringExtra("arg")
+      };
+      handler.sendMessage(msg);
+    }
+  }
 }
diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ApplicationManagerFacade.java b/src/main/java/org/qpython/qsl4a/qsl4a/facade/ApplicationManagerFacade.java
index 57518fc0459fc4ca067d22963ad78dec9add6a12..eefcf3626e647b8d3437275f1fd9ee5534721567 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/facade/ApplicationManagerFacade.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/facade/ApplicationManagerFacade.java
@@ -4,12 +4,16 @@ import android.app.ActivityManager;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 
 
 import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
 import org.qpython.qsl4a.qsl4a.rpc.Rpc;
+import org.qpython.qsl4a.qsl4a.rpc.RpcDefault;
+import org.qpython.qsl4a.qsl4a.rpc.RpcOptional;
 import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
 
 import java.util.ArrayList;
@@ -29,6 +33,7 @@ public class ApplicationManagerFacade extends RpcReceiver {
   private final AndroidFacade mAndroidFacade;
   private final ActivityManager mActivityManager;
   private final PackageManager mPackageManager;
+  private final Context context;
 
   public ApplicationManagerFacade(FacadeManager manager) {
     super(manager);
@@ -36,31 +41,83 @@ public class ApplicationManagerFacade extends RpcReceiver {
     mAndroidFacade = manager.getReceiver(AndroidFacade.class);
     mActivityManager = (ActivityManager) service.getSystemService(Context.ACTIVITY_SERVICE);
     mPackageManager = service.getPackageManager();
+    context = mAndroidFacade.context;
   }
 
-  @Rpc(description = "Returns a list of all launchable application class names.")
-  public Map<String, String> getLaunchableApplications() {
+  @Rpc(description = "Returns a list of all launchable packages with class name and application name .")
+  public Map<String, String> getLaunchablePackages(
+          @RpcParameter(name = "need class name") @RpcDefault("false") Boolean needClassName) {
     Intent intent = new Intent(Intent.ACTION_MAIN);
     intent.addCategory(Intent.CATEGORY_LAUNCHER);
     List<ResolveInfo> resolveInfos = mPackageManager.queryIntentActivities(intent, 0);
     Map<String, String> applications = new HashMap<String, String>();
+    if (needClassName){
+      for (ResolveInfo info : resolveInfos) {
+      applications.put(info.activityInfo.packageName, info.activityInfo.name+"|"+info.loadLabel(mPackageManager).toString());
+    }}
+    else {
     for (ResolveInfo info : resolveInfos) {
-      applications.put(info.loadLabel(mPackageManager).toString(), info.activityInfo.name);
-    }
+      applications.put(info.activityInfo.packageName, info.loadLabel(mPackageManager).toString());
+    }}
     return applications;
   }
 
-  @Rpc(description = "Start activity with the given class name.")
-  public void launch(@RpcParameter(name = "className") String className) {
-    Intent intent = new Intent(Intent.ACTION_MAIN);
-    String packageName = className.substring(0, className.lastIndexOf("."));
-    intent.setClassName(packageName, className);
-    mAndroidFacade.startActivity(intent);
+  /*@Rpc(description = "get all packages")
+  public Map<String,String> getAllPackages() {
+    Map<String, String> packages = new HashMap<>();
+    List<PackageInfo> packageInfos = context.getPackageManager().getInstalledPackages(PackageManager.GET_ACTIVITIES |
+            PackageManager.GET_SERVICES);
+    for (PackageInfo info : packageInfos) {
+      packages.put(info.packageName,  info.applicationInfo.loadLabel(mPackageManager).toString());
+  }
+    return packages;
+  }
+
+  @Rpc(description = "get system packages")
+  public Map<String,String> getSystemPackages() {
+    Map<String, String> packages = new HashMap<>();
+    List<PackageInfo> packageInfos = context.getPackageManager().getInstalledPackages(PackageManager.GET_ACTIVITIES |
+            PackageManager.GET_SERVICES);
+    for (PackageInfo info : packageInfos) {
+      if(((info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 1) || ((info.applicationInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) == 1))
+        packages.put(info.packageName, info.applicationInfo.loadLabel(mPackageManager).toString());
+    }
+    return packages;
+  }
+
+  @Rpc(description = "get user packages")
+  public Map<String,String> getUserPackages() {
+    Map<String, String> packages = new HashMap<>();
+    List<PackageInfo> packageInfos = context.getPackageManager().getInstalledPackages(PackageManager.GET_ACTIVITIES |
+            PackageManager.GET_SERVICES);
+    for (PackageInfo info : packageInfos) {
+      if(((info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 1) && ((info.applicationInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 1))
+        packages.put(info.packageName, info.applicationInfo.loadLabel(mPackageManager).toString());
+    }
+    return packages;
+  }*/
+
+  @Rpc(description = "Start activity with the given classname and/or packagename .")
+  public void launch(@RpcParameter(name = "classname") @RpcOptional final String classname,
+                     @RpcParameter(name = "packagename") @RpcOptional String packagename,
+                     @RpcParameter(name = "wait") @RpcDefault("true") final Boolean wait)
+          throws Exception {
+    Intent intent;
+    if (classname == null) {
+      intent=context.getPackageManager().getLaunchIntentForPackage(packagename);
+    } else {
+      intent = new Intent(Intent.ACTION_MAIN);
+      if (packagename == null) {
+        packagename = classname.substring(0, classname.lastIndexOf("."));
+      }
+      intent.setClassName(packagename, classname);
+    }
+    mAndroidFacade.doStartActivity(intent,wait);
   }
 
   @Rpc(description = "Returns a list of packages running activities or services.", returns = "List of packages running activities.")
-  public List<String> getRunningPackages() {
-    Set<String> runningPackages = new HashSet<String>();
+  public Set<String> getRunningPackages() {
+    Set<String> runningPackages = new HashSet<>();
     List<ActivityManager.RunningAppProcessInfo> appProcesses =
         mActivityManager.getRunningAppProcesses();
     for (ActivityManager.RunningAppProcessInfo info : appProcesses) {
@@ -71,13 +128,46 @@ public class ApplicationManagerFacade extends RpcReceiver {
     for (ActivityManager.RunningServiceInfo info : serviceProcesses) {
       runningPackages.add(info.service.getPackageName());
     }
-    return new ArrayList<String>(runningPackages);
+    return runningPackages;
+  }
+
+  @Rpc(description = "get installed packages")
+  public Map<String,String> getInstalledPackages(
+          @RpcParameter(name = "flag") @RpcDefault("4") final Integer flag
+  ) {
+    Map<String, String> packages = new HashMap<>();
+    List<PackageInfo> packageInfos = context.getPackageManager().getInstalledPackages(PackageManager.GET_UNINSTALLED_PACKAGES);
+    boolean allow;
+    for (PackageInfo info : packageInfos) {
+      switch (flag) {
+        case 5://所有应用
+          allow = true;
+          break;
+        case 4://用户应用
+          allow = ( info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM ) == 0;
+          break;
+        case 3://系统应用
+          allow = ( info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM ) != 0;
+          break;
+        case 2://系统已更新应用
+          allow = ( info.applicationInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP ) != 0;
+          break;
+        case 1://系统未更新应用
+          allow = ( info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM ) != 0 && ( info.applicationInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP ) == 0;
+          break;
+        default:
+          allow = false;
+      }
+      if(allow)
+          packages.put(info.packageName,  info.applicationInfo.loadLabel(mPackageManager).toString());
+    }
+    return packages;
   }
 
   @SuppressWarnings("deprecation")
 @Rpc(description = "Force stops a package.")
   public void forceStopPackage(
-      @RpcParameter(name = "packageName", description = "name of package") String packageName) {
+      @RpcParameter(name = "packageName", description = "name of package") final String packageName) {
     mActivityManager.restartPackage(packageName);
   }
 
diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/facade/CameraFacade.java b/src/main/java/org/qpython/qsl4a/qsl4a/facade/CameraFacade.java
index 189015288107af56a78efc9f221b0f70f126f7ad..806cdab8e98246cfa4ea8b57e4f00e52e0ea47d4 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/facade/CameraFacade.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/facade/CameraFacade.java
@@ -16,7 +16,6 @@
 
 package org.qpython.qsl4a.qsl4a.facade;
 
-import android.annotation.SuppressLint;
 import android.app.Service;
 
 import android.content.Context;
@@ -38,7 +37,7 @@ import android.view.WindowManager;
 import android.view.SurfaceHolder.Callback;
 
 import org.qpython.qsl4a.QSL4APP;
-import org.qpython.qsl4a.qsl4a.FileUtils;
+import org.qpython.qsl4a.qsl4a.util.FileUtils;
 import org.qpython.qsl4a.qsl4a.FutureActivityTaskExecutor;
 import org.qpython.qsl4a.qsl4a.LogUtil;
 
diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/facade/CipherFacade.java b/src/main/java/org/qpython/qsl4a/qsl4a/facade/CipherFacade.java
index 1dcf35b3de567666dc21414d1b13812a3453a4d5..9446abe6bc39a26cd509529e66ecfc97182403d2 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/facade/CipherFacade.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/facade/CipherFacade.java
@@ -11,7 +11,9 @@ import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.nio.ByteBuffer;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
@@ -35,27 +37,22 @@ public class CipherFacade extends RpcReceiver {
         mPackageManager = mService.getPackageManager();
     }
 
-    private static byte[] readFromFile(String filePath) {
-        try {
-            File file = new File(filePath);
-            FileInputStream fis = new FileInputStream(file);
-            int length = fis.available();
-            byte[] data = new byte[length];
-            fis.read(data);
-            fis.close();
-            return data;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return new byte[0];
-        }}
-
-    private static void writeToFile(String filePath, byte[] data) {
-        try {
-            FileOutputStream fos = new FileOutputStream(filePath);
-            fos.write(data);
-            fos.flush();
-            fos.close();
-        } catch (Exception e) {e.printStackTrace();}}
+    private static byte[] readFromFile(String filePath) throws Exception {
+        File file = new File(filePath);
+        FileInputStream fis = new FileInputStream(file);
+        int length = fis.available();
+        byte[] data = new byte[length];
+        fis.read(data);
+        fis.close();
+        return data;
+        }
+
+    private static void writeToFile(String filePath, byte[] data) throws Exception {
+        FileOutputStream fos = new FileOutputStream(filePath);
+        fos.write(data);
+        fos.flush();
+        fos.close();
+    }
 
     /**
      * @function cipherInit 加密解密引擎设置
@@ -91,11 +88,12 @@ public class CipherFacade extends RpcReceiver {
             } else {
                 InitialVector = initialVector.getBytes(encodingFormat);
             }
-            /*if (InitialVector.length > 16){
-                byte[] IV = {};
-                System.arraycopy(InitialVector,0,IV,0,16);
-                InitialVector = IV;
-            }*/
+        }
+        if (InitialVector.length > 16){
+            //InitialVector长度大于16时自动截取
+            byte[] IV = new byte[16];
+            System.arraycopy(InitialVector,0,IV,0,16);
+            InitialVector = IV;
         }
         //Algorithm 加密算法如AES
         String Algorithm;
diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/facade/CommonIntentsFacade.java b/src/main/java/org/qpython/qsl4a/qsl4a/facade/CommonIntentsFacade.java
index f0baf0d40df396ac3783da8975c3d79e1687f5a3..7cf9a36cb3c8c68528856fa40c1e40bb6ab86777 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/facade/CommonIntentsFacade.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/facade/CommonIntentsFacade.java
@@ -69,7 +69,7 @@ public class CommonIntentsFacade extends RpcReceiver {
     }
   }
 
-  private void view(Uri uri, String type) {
+  private void view(Uri uri, String type) throws Exception {
 
     Intent intent = new Intent();
     intent.setClassName(this.mAndroidFacade.getmService().getApplicationContext(),"org.qpython.qpy.main.QWebViewActivity");
@@ -96,7 +96,7 @@ public class CommonIntentsFacade extends RpcReceiver {
   }
 
   @Rpc(description = "Opens the list of contacts.")
-  public void viewContacts() throws JSONException {
+  public void viewContacts() throws Exception {
     view(People.CONTENT_URI, null);
   }
 
@@ -123,7 +123,7 @@ public class CommonIntentsFacade extends RpcReceiver {
   }
 
   @Rpc(description = "Starts a search for the given query.")
-  public void search(@RpcParameter(name = "query") String query) {
+  public void search(@RpcParameter(name = "query") String query) throws Exception {
     Intent intent = new Intent(Intent.ACTION_SEARCH);
     intent.putExtra(SearchManager.QUERY, query);
     mAndroidFacade.startActivity(intent);
diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/facade/FloatViewFacade.java b/src/main/java/org/qpython/qsl4a/qsl4a/facade/FloatViewFacade.java
index 936a1b6632dda19b015cbe8288a3400e4767309b..925606fef099380f9ebb26877e39a9a490b807db 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/facade/FloatViewFacade.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/facade/FloatViewFacade.java
@@ -28,12 +28,22 @@ public class FloatViewFacade extends RpcReceiver {
   private final String protectActivity = "org.qpython.qpy.main.auxActivity.ProtectActivity";
   private final Context context;
 
+  private final String[] argName = new String[] {
+          "x","y","width","height","textSize", //Integer型(可以设为上次)
+          "index", //Integer型(索引，不可设为上次)
+          "text","html", //字符型(二选一)
+          "backColor","textColor", //字符型(二选一)
+          "clickRemove", //布尔型
+          "flag", //Integer型(索引，不可设为上次)
+          "script","arg" //字符型(无前则无后)
+  };
+
   //按钮数组
   public static final ArrayList<Button> buttons = new ArrayList<>();
   //参数数组
   public static final ArrayList<WindowManager.LayoutParams> params = new ArrayList<>();
   //时间数组
-  public static final ArrayList<String> times = new ArrayList<>();
+  public static final ArrayList<Long> times = new ArrayList<>();
   //操作类型数组
   public static final ArrayList<String> operations = new ArrayList<>();
   //窗口管理器
@@ -57,13 +67,6 @@ public class FloatViewFacade extends RpcReceiver {
     }
     Intent intent = new Intent();
     intent.setClassName(mService.getPackageName(),floatViewActivity);
-    String[] argName = new String[] {
-            "x","y","width","height","textSize", //Integer型(可以设为上次)
-            "index", //Integer型(索引，不可设为上次)
-            "text","html", //字符型(二选一)
-            "backColor","textColor","script","arg", //字符型(可全选)
-            "clickRemove" //布尔型
-    };
     String ArgName;
     int index = -1;
     for(byte i=0;i<5;i++) {
@@ -90,16 +93,28 @@ public class FloatViewFacade extends RpcReceiver {
         break;
       } catch (Exception ignored) {}
     }
-    for(byte i=8;i<12;i++) {
+    for(byte i=8;i<10;i++) {
       ArgName = argName[i];
       try {
         intent.putExtra(ArgName, args.getString(ArgName));
       } catch (Exception ignored) {}
     }
-    ArgName = argName[12];
+    ArgName = argName[10];
     try {
       intent.putExtra(ArgName, args.getBoolean(ArgName));
     } catch (Exception ignored) {}
+    ArgName = argName[11];
+    try {
+      intent.putExtra(ArgName, args.getInt(ArgName));
+    } catch (Exception ignored) {}
+    for(byte i=12;i<14;i++) {
+      ArgName = argName[i];
+      try {
+        intent.putExtra(ArgName, args.getString(ArgName));
+      } catch (Exception e) {
+        break;
+      }
+    }
     //intent.setFlags(Intent.FLAG_FROM_BACKGROUND | Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
     intent.setAction(Intent.ACTION_VIEW);
     if(handler == null) {
@@ -124,14 +139,17 @@ public class FloatViewFacade extends RpcReceiver {
         throw new Exception(context.getString(R.string.float_view_out_range));
       }
       WindowManager.LayoutParams layoutParams = params.get(index);
+      if(buttons.get(index) == null){
+        result.put("removed",true);
+      }
       //返回横坐标，原点为屏幕中心
       result.put("x", layoutParams.x);
       //返回纵坐标，原点为屏幕中心
       result.put("y", layoutParams.y);
       //返回操作时间
-      result.put("time",times.get(index));
+      result.put("time", times.get(index));
       //返回操作类型
-      result.put("operation",operations.get(index));
+      result.put("operation", operations.get(index));
       //返回索引位置
       result.put("index",index);
       return result;
@@ -146,9 +164,9 @@ public class FloatViewFacade extends RpcReceiver {
     //返回删除的悬浮窗个数
     if (index>-2){
       if(index==-1){//删除所有悬浮窗
-        index = buttons.size();
+        index = 0;
         for(Button button : buttons)
-          windowManager.removeView(button);
+          index += removeButton(button);
         buttons.clear();
         params.clear();
         times.clear();
@@ -158,8 +176,7 @@ public class FloatViewFacade extends RpcReceiver {
           if(index>=buttons.size()){
             throw new Exception(context.getString(R.string.float_view_out_range));
           }
-          removeButton(index);
-          index = 1;
+          index = removeButton(index);
         } catch (Exception e){
           throw new Exception(e.toString());
         }
@@ -170,19 +187,40 @@ public class FloatViewFacade extends RpcReceiver {
     return index;
   }
 
-  public static void removeButton(int index){
-    windowManager.removeView(buttons.get(index));
-    buttons.remove(index);
-    params.remove(index);
-    times.remove(index);
-    operations.remove(index);
+  public static int removeButton(int index){
+    int i = removeButton(buttons.get(index));
+    buttons.set(index,null);
+    return i;
+  }
+
+  private static int removeButton(Button button){
+    if(button!=null) {
+      windowManager.removeView(button);
+      return 1;
+    } else return 0;
+  }
+
+  @Rpc(description = "Float View Count .")
+  public int floatViewCount(){
+    int cnt = 0;
+    for(int i=0;i<buttons.size();i++)
+      if(buttons.get(i)!=null)
+        cnt+=1;
+      return cnt;
   }
 
   @Rpc(description = "QPython Background Protect .")
-  public void backgroundProtect() throws Exception {
+  public void backgroundProtect(
+          @RpcParameter(name = "enabled") @RpcDefault("true") Boolean enabled
+  ) throws Exception {
     Intent intent = new Intent();
     intent.setClassName(mService.getPackageName(),protectActivity);
-    intent.setAction(Intent.ACTION_VIEW);
+    String action;
+    if(enabled)
+      action = Intent.ACTION_RUN;
+    else
+      action = Intent.ACTION_DELETE;
+    intent.setAction(action);
     mAndroidFacade.startActivity(intent);
   }
 
diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/facade/QPyInterfaceFacade.java b/src/main/java/org/qpython/qsl4a/qsl4a/facade/QPyInterfaceFacade.java
index 774b6925894704952e0e12b2e78220862e078c28..8e15bc4b07e6a111ec93fefe695af3e35290d469 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/facade/QPyInterfaceFacade.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/facade/QPyInterfaceFacade.java
@@ -4,11 +4,15 @@ import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Environment;
+import android.os.Handler;
+import android.os.Message;
 
-import org.qpython.qsl4a.qsl4a.FileUtils;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.qpython.qsl4a.qsl4a.util.FileUtils;
 import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
 import org.qpython.qsl4a.qsl4a.rpc.Rpc;
+import org.qpython.qsl4a.qsl4a.rpc.RpcDefault;
 import org.qpython.qsl4a.qsl4a.rpc.RpcOptional;
 import org.qpython.qsl4a.qsl4a.rpc.RpcParameter;
 import org.qpython.qsl4a.qsl4a.util.SPFUtils;
@@ -21,11 +25,16 @@ import java.io.File;
  */
 public class QPyInterfaceFacade extends RpcReceiver {
     private final Service mService;
+    private final AndroidFacade mAndroidFacade;
+    private final Context context;
+    public static Handler handler;
+    private static JSONObject SharedVariable;
 
     public QPyInterfaceFacade(FacadeManager manager) {
         super(manager);
         mService = manager.getService();
-
+        mAndroidFacade = manager.getReceiver(AndroidFacade.class);
+        context = mAndroidFacade.context;
     }
 
     @Override
@@ -34,14 +43,14 @@ public class QPyInterfaceFacade extends RpcReceiver {
     }
 
     @Rpc(description = "Execute QPython script throught SL4A", returns = "True if the operation succeeded.")
-    public Boolean executeQPyAsSrv(@RpcParameter(name = "QPython script path")  @RpcOptional String path) {
+    public Boolean executeQPyAsSrv(@RpcParameter(name = "QPython script path") @RpcOptional String path) {
         Intent intent = new Intent();
         intent.setClassName(mService.getPackageName(), "org.qpython.qpylib.MPyService");
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.setAction("org.qpython.qpylib.action.MPyApi");
 
         Bundle mBundle = new Bundle();
-        mBundle.putString("app", SPFUtils.getCode(mService.getApplicationContext()));
+        mBundle.putString("app", SPFUtils.getCode(context));
         mBundle.putString("act", "onPyApi");
         mBundle.putString("flag", "api");
         mBundle.putString("param", "fileapi");
@@ -49,42 +58,51 @@ public class QPyInterfaceFacade extends RpcReceiver {
 
         intent.putExtras(mBundle);
 
-        mService.getApplicationContext().startService(intent);
+        context.startService(intent);
 
         return true;
     }
 
 
     @Rpc(description = "Execute QPython script throught SL4A", returns = "True if the operation succeeded.")
-    public Boolean executeQPy(@RpcParameter(name = "QPython script path")  @RpcOptional String path) {
-        Intent intent = new Intent();
-        intent.setClassName(mService.getPackageName(), "org.qpython.qpylib.MPyApi");
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.setAction("org.qpython.qpylib.action.MPyApi");
-
-        Bundle mBundle = new Bundle();
-        mBundle.putString("app", SPFUtils.getCode(mService.getApplicationContext()));
-        mBundle.putString("act", "onPyApi");
-        mBundle.putString("flag", "api");
-        mBundle.putString("param", "fileapi");
-        mBundle.putString("pyfile", path);
-
-        intent.putExtras(mBundle);
-
-        mService.getApplicationContext().startActivity(intent);
+    public Boolean executeQPy(
+            @RpcParameter(name = "QPython script path") @RpcDefault("") String path,
+            @RpcParameter(name = "QPython script arguments") @RpcOptional String arg
+                              ) {
+        try {
+            Message msg = new Message();
+            msg.obj = new String[]{path,arg};
+            handler.sendMessage(msg);
+        } catch (Exception e) {
+            Intent intent = new Intent();
+            intent.setClassName(mService.getPackageName(), "org.qpython.qpylib.MPyApi");
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.setAction("org.qpython.qpylib.action.MPyApi");
+
+            Bundle mBundle = new Bundle();
+            mBundle.putString("app", SPFUtils.getCode(context));
+            mBundle.putString("act", "onPyApi");
+            mBundle.putString("flag", "api");
+            mBundle.putString("param", "fileapi");
+            mBundle.putString("pyfile", path);
+            mBundle.putString("pyarg",arg);
+
+            intent.putExtras(mBundle);
+            context.startActivity(intent);
+        }
 
         return true;
     }
 
     @Rpc(description = "Execute QPython script throught SL4A", returns = "True if the operation succeeded.")
-    public Boolean executeQPyCodeAsSrv(@RpcParameter(name = "QPython script code")  @RpcOptional String code) {
+    public Boolean executeQPyCodeAsSrv(@RpcParameter(name = "QPython script code") @RpcOptional String code) {
         Intent intent = new Intent();
         intent.setClassName(mService.getPackageName(), "org.qpython.qpylib.MPyService");
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.setAction("org.qpython.qpylib.action.MPyService");
 
         Bundle mBundle = new Bundle();
-        mBundle.putString("app", SPFUtils.getCode(mService.getApplicationContext()));
+        mBundle.putString("app", SPFUtils.getCode(context));
         mBundle.putString("act", "onPyApi");
         mBundle.putString("flag", "api");
         mBundle.putString("param", "codeapi");
@@ -92,20 +110,20 @@ public class QPyInterfaceFacade extends RpcReceiver {
 
         intent.putExtras(mBundle);
 
-        mService.getApplicationContext().startService(intent);
+        context.startService(intent);
 
         return true;
     }
 
     @Rpc(description = "Execute QPython script throught SL4A", returns = "True if the operation succeeded.")
-    public Boolean executeQPyCode(@RpcParameter(name = "QPython script code")  @RpcOptional String code) {
+    public Boolean executeQPyCode(@RpcParameter(name = "QPython script code") @RpcOptional String code) {
         Intent intent = new Intent();
         intent.setClassName(mService.getPackageName(), "org.qpython.qpylib.MPyApi");
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.setAction("org.qpython.qpylib.action.MPyApi");
 
         Bundle mBundle = new Bundle();
-        mBundle.putString("app", SPFUtils.getCode(mService.getApplicationContext()));
+        mBundle.putString("app", SPFUtils.getCode(context));
         mBundle.putString("act", "onPyApi");
         mBundle.putString("flag", "api");
         mBundle.putString("param", "codeapi");
@@ -113,20 +131,21 @@ public class QPyInterfaceFacade extends RpcReceiver {
 
         intent.putExtras(mBundle);
 
-        mService.getApplicationContext().startActivity(intent);
+        context.startActivity(intent);
 
         return true;
     }
 
     @Rpc(description = "Get last QPython execute log", returns = "LogUtil string")
-    public String getLastLog(@RpcParameter(name = "QPython script path")  @RpcOptional String path, Context context) {
-        String content;
+    public String getLastLog(
+            @RpcParameter(name = "QPython log name") @RpcDefault("last.log") String logName) {
+        /*String content;
         content = FileUtils.getFileContents(path, 64);
         boolean isQApp = content.contains("#qpy:qpyapp");
         boolean isWeb = content.contains("#qpy:webapp");
-        boolean isKivy = content.contains("#qpy:kivy");
+        //boolean isKivy = content.contains("#qpy:kivy");
 
-        if (isKivy) {
+        /*if (isKivy) {
             File script = new File(path);
             String log = script.getParentFile().getAbsolutePath()+"/.run.log";
             File lf = new File(log);
@@ -143,27 +162,50 @@ public class QPyInterfaceFacade extends RpcReceiver {
 
         } else if (isWeb || isQApp) {
             //File script = new File(path);
-//            String log = Environment.getExternalStorageDirectory()+ "/qpython/log/last.log";
-            String log = com.quseit.util.FileUtils.getQyPath(context) + "/qpython/log/last.log";
-            File lf = new File(log);
-            if (lf.exists()) {
-                return "# QPython:getLastLog(ok)\n"
-                        +"# RunTime:"+ SPFUtils.getDateTime(lf.lastModified())+"\n"
-                        +"# LogFile:"+ log+"\n"
-                        +FileUtils.getFileContents(log);
-            } else {
-                return "# QPython:getLastLog(-1)\n"
-                        +"# LogFile:"+ log
-                        ;
+            */
+        String log = context.getExternalFilesDir("").getParent() + "/log/" + logName;
+        File lf = new File(log);
+        if (lf.exists()) {
+            return "# QPython:getLastLog(ok)\n"
+                    + "# RunTime:" + SPFUtils.getDateTime(lf.lastModified()) + "\n"
+                    + "# LogFile:" + log + "\n"
+                    + FileUtils.getFileContents(log);
+        } else {
+            return "# QPython:getLastLog(-1)\n"
+                    + "# LogFile:" + log
+                    ;
 
-            }
+        }
 
 
-        } else {
+    } /*else {
             return "";
 
-        }
+        }*/
 
+    @Rpc(description = "set Java Shared Variable .")
+    public void sharedVariableSet(
+            @RpcParameter(name = "key") String key,
+            @RpcParameter(name = "value") String value
+    ) throws JSONException {
+        if(SharedVariable==null)
+            SharedVariable=new JSONObject();
+        SharedVariable.put(key,value);
     }
 
-}
\ No newline at end of file
+    @Rpc(description = "get Java Shared Variable .")
+    public String sharedVariableGet(
+            @RpcParameter(name = "key") String key
+    ) throws JSONException {
+        return SharedVariable.getString(key);
+    }
+
+    @Rpc(description = "remove Java Shared Variable .")
+    public void sharedVariableRemove(
+            @RpcParameter(name = "key") String key
+    ) throws JSONException {
+        SharedVariable.remove(key);
+        if(SharedVariable.length()==0)
+            SharedVariable=null;
+    }
+}
diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/facade/usb/USBHostSerialFacade.java b/src/main/java/org/qpython/qsl4a/qsl4a/facade/usb/USBHostSerialFacade.java
index c4f60982cfcc7ff19672d3ca5149b2f26c5fa445..756c1c7264cfa90d743d5b2b40d49abe5141b30a 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/facade/usb/USBHostSerialFacade.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/facade/usb/USBHostSerialFacade.java
@@ -565,14 +565,14 @@ public class USBHostSerialFacade extends RpcReceiver {
    * connectionFailed: Indicate that the connection attempt failed and notify the UI Activity. {{{1
    */
   private void connectionFailed() {
-    mAndroidFacade.makeToast("USBHostSerial: Unable to connect device",0);
+    mAndroidFacade.makeToast("USBHostSerial: Unable to connect device");
   }
 
   /**
    * connectionLost: Indicate that the connection was lost and notify the UI Activity. {{{1
    */
   private void connectionLost() {
-    mAndroidFacade.makeToast("USBHostSerial: connection lost",0);
+    mAndroidFacade.makeToast("USBHostSerial: connection lost");
   }
 
   /**
diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterConstants.java b/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterConstants.java
index ebeb4c11ae1e055f7fc08bcef2dd5b6d0e2cbed9..27b0aadc11976916609dbe10acde6bfa4f0ab86b 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterConstants.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterConstants.java
@@ -18,8 +18,6 @@ package org.qpython.qsl4a.qsl4a.interpreter;
 
 import android.os.Environment;
 
-import com.quseit.util.FileUtils;
-
 /**
  * A collection of constants required for installation/removal of an interpreter.
  * 
@@ -28,15 +26,16 @@ import com.quseit.util.FileUtils;
  */
 public interface InterpreterConstants {
 
-//  public static final String SDCARD_ROOT = Environment.getExternalStorageDirectory().getAbsolutePath() + "/";
+  public static final String SDCARD_ROOT =
+      Environment.getExternalStorageDirectory().getAbsolutePath() + "/";
 
-//  public static final String SDCARD_SL4A_ROOT = SDCARD_ROOT + "sl4a/";
+  public static final String SDCARD_SL4A_ROOT = SDCARD_ROOT + "sl4a/";
 
-//  public static final String SCRIPTS_ROOT = SDCARD_SL4A_ROOT + "scripts/";
+  public static final String SCRIPTS_ROOT = SDCARD_SL4A_ROOT + "scripts/";
 
-//  public static final String SDCARD_SL4A_DOC = SDCARD_SL4A_ROOT + "doc/";
+  public static final String SDCARD_SL4A_DOC = SDCARD_SL4A_ROOT + "doc/";
 
-//  public static final String SL4A_DALVIK_CACHE_ROOT = "/dalvik-cache/";
+  public static final String SL4A_DALVIK_CACHE_ROOT = "/dalvik-cache/";
 
   public static final String INTERPRETER_EXTRAS_ROOT = "/extras/";
 
diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterProcess.java b/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterProcess.java
index fa563d82d2938cd89340777e2b746acc52006b93..4a00b5c90dcbb2763d89838c99f3637c45fffbcd 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterProcess.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/InterpreterProcess.java
@@ -16,11 +16,8 @@
 
 package org.qpython.qsl4a.qsl4a.interpreter;
 
-import android.content.Context;
-
 import org.qpython.qsl4a.qsl4a.Analytics;
 import org.qpython.qsl4a.qsl4a.AndroidProxy;
-import org.qpython.qsl4a.qsl4a.FileUtils;
 import org.qpython.qsl4a.qsl4a.LogUtil;
 import org.qpython.qsl4a.qsl4a.Process;
 import org.qpython.qsl4a.qsl4a.SimpleServer;
@@ -106,13 +103,13 @@ public class InterpreterProcess extends Process {
   }
 
   @Override
-  public void start(Context context, final Runnable shutdownHook) {
+  public void start(final Runnable shutdownHook) {
     Analytics.track(mInterpreter.getName());
     // NOTE(damonkohler): String.isEmpty() doesn't work on Cupcake.
     if (!mCommand.equals("")) {
       addArgument(mCommand);
     }
-    super.start(context,shutdownHook);
+    super.start(shutdownHook);
   }
 
   @Override
@@ -122,7 +119,7 @@ public class InterpreterProcess extends Process {
   }
 
   @Override
-  public String getWorkingDirectory(Context context) {
-    return FileUtils.getScriptsRootPath(context);
+  public String getWorkingDirectory() {
+    return InterpreterConstants.SDCARD_SL4A_ROOT;
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/html/HtmlActivityTask.java b/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/html/HtmlActivityTask.java
index 15bfaf7ab469a9f89d3dfd7ddf0c45e21d424cac..263c959dc282928efe72d61c2e5a7b8c7f7dbeca 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/html/HtmlActivityTask.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/html/HtmlActivityTask.java
@@ -36,14 +36,13 @@ import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
-import org.qpython.qsl4a.qsl4a.FileUtils;
+import org.qpython.qsl4a.qsl4a.util.FileUtils;
 import org.qpython.qsl4a.qsl4a.LogUtil;
 import org.qpython.qsl4a.qsl4a.SingleThreadExecutor;
 import org.qpython.qsl4a.qsl4a.event.Event;
 import org.qpython.qsl4a.qsl4a.facade.EventFacade;
 import org.qpython.qsl4a.qsl4a.facade.ui.UiFacade;
 import org.qpython.qsl4a.qsl4a.future.FutureActivityTask;
-import org.qpython.qsl4a.qsl4a.interpreter.InterpreterConstants;
 import org.qpython.qsl4a.qsl4a.jsonrpc.JsonBuilder;
 import org.qpython.qsl4a.qsl4a.jsonrpc.JsonRpcResult;
 import org.qpython.qsl4a.qsl4a.jsonrpc.RpcReceiver;
diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/html/HtmlInterpreter.java b/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/html/HtmlInterpreter.java
index 58ca7aeaefdfd78438d80239958c756a9f498cdf..a73f6e0690c543adab16e9e7780f30180078b3a1 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/html/HtmlInterpreter.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/interpreter/html/HtmlInterpreter.java
@@ -18,7 +18,7 @@ package org.qpython.qsl4a.qsl4a.interpreter.html;
 
 import android.content.Context;
 
-import org.qpython.qsl4a.qsl4a.FileUtils;
+import org.qpython.qsl4a.qsl4a.util.FileUtils;
 import org.qpython.qsl4a.qsl4a.interpreter.Interpreter;
 import org.qpython.qsl4a.qsl4a.language.HtmlLanguage;
 
diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/FileUtils.java b/src/main/java/org/qpython/qsl4a/qsl4a/util/FileUtils.java
similarity index 86%
rename from src/main/java/org/qpython/qsl4a/qsl4a/FileUtils.java
rename to src/main/java/org/qpython/qsl4a/qsl4a/util/FileUtils.java
index 1f9cbf5cf1f954cad23dfd78ffcc3e94b849ab68..e8251665263cf6119960122967287ee398ba0080 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/FileUtils.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/util/FileUtils.java
@@ -14,12 +14,15 @@
  * the License.
  */
 
-package org.qpython.qsl4a.qsl4a;
+package org.qpython.qsl4a.qsl4a.util;
 
 import android.content.Context;
 import android.content.res.AssetManager;
 import android.os.Environment;
 
+import org.qpython.qsl4a.qsl4a.IoUtils;
+import org.qpython.qsl4a.qsl4a.LogUtil;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -48,18 +51,6 @@ public class FileUtils {
         || Environment.MEDIA_MOUNTED_READ_ONLY.equals(state);
   }
 
-  public static String getRootPath(Context context){
-    return com.quseit.util.FileUtils.getQyPath(context) + "/sl4a/";
-  }
-
-  public static String getScriptsRootPath(Context context){
-    return getRootPath(context) + "scripts/";
-  }
-
-  public static String getBasePath(Context context){
-    return "file://" + getScriptsRootPath(context);
-  }
-
   public static String getFileContents(String filename) {
 
     File scriptFile = new File( filename );
@@ -196,16 +187,15 @@ public class FileUtils {
     return true;
   }
 
-  public static File getExternalDownload(Context context) {
-//    try {
-//      Class<?> c = Class.forName("android.os.Environment");
-//      Method m = c.getDeclaredMethod("getExternalStoragePublicDirectory", String.class);
-//      String download = c.getDeclaredField("DIRECTORY_DOWNLOADS").get(null).toString();
-//      return (File) m.invoke(null, download);
-//    } catch (Exception e) {
-//      return new File(Environment.getExternalStorageDirectory(), "Download");
-//    }
-    return context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
+  public static File getExternalDownload() {
+    try {
+      Class<?> c = Class.forName("android.os.Environment");
+      Method m = c.getDeclaredMethod("getExternalStoragePublicDirectory", String.class);
+      String download = c.getDeclaredField("DIRECTORY_DOWNLOADS").get(null).toString();
+      return (File) m.invoke(null, download);
+    } catch (Exception e) {
+      return new File(Environment.getExternalStorageDirectory(), "Download");
+    }
   }
 
   public static boolean rename(File file, String name) {
@@ -239,4 +229,4 @@ public class FileUtils {
     return builder.toString();
   }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/qpython/qsl4a/qsl4a/util/SPFUtils.java b/src/main/java/org/qpython/qsl4a/qsl4a/util/SPFUtils.java
index 60b1f32dabff932202093c6cea02c134dbd20722..c0f7a148e5f56538b9bba12435a9226fb01d40c7 100644
--- a/src/main/java/org/qpython/qsl4a/qsl4a/util/SPFUtils.java
+++ b/src/main/java/org/qpython/qsl4a/qsl4a/util/SPFUtils.java
@@ -12,8 +12,6 @@ import android.graphics.Color;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
-import android.os.Build;
-import android.util.Log;
 
 import java.text.SimpleDateFormat;
 import java.util.UUID;
@@ -66,9 +64,9 @@ public class SPFUtils {
     }
 
     public static Notification getNotification(Context context, String contentTitle, String contentText, PendingIntent intent,
-                                               int smallIconId, Bitmap largeIconId, int flags) {
+                                               int smallIconId, Bitmap largeIconId) {
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-            NotificationChannel chan = new NotificationChannel(context.getPackageName(), contentTitle, NotificationManager.IMPORTANCE_NONE);
+            NotificationChannel chan = new NotificationChannel(context.getPackageName(), contentTitle, NotificationManager.IMPORTANCE_DEFAULT);
 
             chan.setLightColor(Color.BLUE);
             chan.setLockscreenVisibility(Notification.VISIBILITY_PRIVATE);
@@ -76,7 +74,7 @@ public class SPFUtils {
             assert manager != null;
             manager.createNotificationChannel(chan);
 
-            Notification notification = new Notification.Builder(context, context.getPackageName()) //new Notification(icon, tickerText, when);
+            return new Notification.Builder(context, context.getPackageName()) //new Notification(icon, tickerText, when);
                     .setTicker(contentTitle)
                     .setContentTitle(contentTitle)
                     .setContentText(contentText)
@@ -85,10 +83,9 @@ public class SPFUtils {
                     .setAutoCancel(true)
                     .setContentIntent(intent)
                     .build();
+        } else {
 
-            return notification;
-        } else if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
-            Notification notification = new Notification.Builder(context) //new Notification(icon, tickerText, when);
+            return new Notification.Builder(context) //new Notification(icon, tickerText, when);
                     .setTicker(contentTitle)
                     .setContentTitle(contentTitle)
                     .setContentText(contentText)
@@ -97,26 +94,6 @@ public class SPFUtils {
                     .setAutoCancel(true)
                     .setContentIntent(intent)
                     .build();
-
-            return notification;
-        } else if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB){
-            Notification notification = new Notification.Builder(context) //new Notification(icon, tickerText, when);
-                    .setTicker(contentTitle)
-                    .setContentTitle(contentTitle)
-                    .setContentText(contentText)
-                    .setSmallIcon(smallIconId)
-                    .setSmallIcon(smallIconId)
-                    .setLargeIcon(largeIconId)
-                    .setAutoCancel(true)
-                    .setContentIntent(intent)
-                    .getNotification();
-            return notification;
-        } else {
-            Notification notification = new Notification(smallIconId, contentTitle, System.currentTimeMillis());
-            notification.tickerText = contentTitle;
-            notification.contentIntent = intent;
-            notification.flags |= flags;
-            return null;
         }
     }