diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..5122ace1
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,27 @@
+image: java:8-jdk
+
+stages:
+  - build
+  - deploy
+
+build:
+  tags:
+    - docker
+  image: java:8-jdk
+  stage: build
+  artifacts:
+    name: "stratacode"
+    expire_in: 1 month
+    paths:
+      - coreRuntime/build/libs
+      - fullRuntime/build/libs
+      - system/build/libs
+  script:
+  - ./gradlew
+
+deploy:
+  tags:
+    - docker
+  stage: deploy
+  script:
+  - ./gradlew uploadArchives
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index dbfa96dc..452d6085 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,6 +66,22 @@ subprojects {
             }
        }
    }
+
+    project.uploadArchives {
+        repositories {
+            mavenDeployer {
+                repository(url: System.getenv('MAVEN_DEPLOYER_REPOSITORY')) {
+                    authentication(userName: System.getenv('MAVEN_DEPLOYER_USERNAME'), password: System.getenv('MAVEN_DEPLOYER_PASSWORD'))
+                }
+                snapshotRepository(url: System.getenv('MAVEN_DEPLOYER_SNAPSHOT_REPOSITORY')) {
+                    authentication(userName: System.getenv('MAVEN_DEPLOYER_USERNAME'), password: System.getenv('MAVEN_DEPLOYER_PASSWORD'))
+                }
+                pom.version = version
+                // pom.artifactId is set automatically for each project (coreRuntime, fullRuntime, system)
+                pom.groupId = stratacodeGroup
+            }
+        }
+    }
 }
 
 project(':coreRuntime') {
@@ -82,6 +98,6 @@ project(':system') {
     apply plugin: 'java'
     dependencies {
         compile project(':fullRuntime')
-        compile 'jline:jline:1.0'
+        compile 'jline:jline:2.14.5'
     }
 }
diff --git a/fullRuntime/src/sc/util/FileUtil.java b/fullRuntime/src/sc/util/FileUtil.java
index 2dd28dfe..fd7a933c 100755
--- a/fullRuntime/src/sc/util/FileUtil.java
+++ b/fullRuntime/src/sc/util/FileUtil.java
@@ -745,16 +745,18 @@ public static String makeCanonical(String dir) throws IOException {
    }
 
    public static String makePathAbsolute(String path) {
-      String[] pathDirs = StringUtil.split(path, FileUtil.PATH_SEPARATOR_CHAR);
-      StringBuilder sb = new StringBuilder();
-      boolean first = true;
-      for (String pathDir:pathDirs) {
-         if (!first)
-            sb.append(FileUtil.PATH_SEPARATOR_CHAR);
-         else
-            first = false;
-         sb.append(FileUtil.makeAbsolute(pathDir));
-      }
-      return sb.toString();
+       path = path.replace(":\\", "|");  // replace windows absolute paths of the form C:\ since the split operation below relies on ':' as a separator
+       String[] pathDirs = StringUtil.split(path, ':');
+       StringBuilder sb = new StringBuilder();
+       boolean first = true;
+       for (String pathDir : pathDirs) {
+           if (!first) {
+               sb.append(FileUtil.PATH_SEPARATOR_CHAR);
+           } else {
+               first = false;
+           }
+           sb.append(FileUtil.makeAbsolute(pathDir.replace("|", ":\\")));  // restore windows absolute paths
+       }
+       return sb.toString();
    }
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..085fed18
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..38a00b38
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Apr 18 08:26:50 JST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 00000000..4453ccea
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 00000000..e95643d6
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/system/src/sc/lang/AbstractInterpreter.java b/system/src/sc/lang/AbstractInterpreter.java
index 29ff0b49..2457cc72 100644
--- a/system/src/sc/lang/AbstractInterpreter.java
+++ b/system/src/sc/lang/AbstractInterpreter.java
@@ -8,24 +8,48 @@
 import sc.bind.DestinationListener;
 import sc.dyn.DynUtil;
 import sc.dyn.IScheduler;
-import sc.lang.sc.PropertyAssignment;
+import sc.dyn.ScheduledJob;
+import sc.lang.java.AbstractMethodDefinition;
+import sc.lang.java.BlockStatement;
+import sc.lang.java.BodyTypeDeclaration;
+import sc.lang.java.DeclarationType;
+import sc.lang.java.Expression;
+import sc.lang.java.ImportDeclaration;
+import sc.lang.java.JavaModel;
+import sc.lang.java.JavaSemanticNode;
+import sc.lang.java.ModelUtil;
+import sc.lang.java.Package;
+import sc.lang.java.Statement;
+import sc.lang.java.TypeDeclaration;
+import sc.lang.java.TypedDefinition;
+import sc.lang.java.VariableDefinition;
 import sc.lang.sc.EndTypeDeclaration;
 import sc.lang.sc.ModifyDeclaration;
-import sc.lang.java.Package;
-import sc.lang.java.*;
+import sc.lang.sc.PropertyAssignment;
+import sc.layer.Layer;
 import sc.layer.LayerUtil;
-import sc.layer.SrcEntry;
 import sc.layer.LayeredSystem;
-import sc.parser.*;
+import sc.layer.SrcEntry;
+import sc.parser.ParentParseNode;
+import sc.parser.ParseError;
+import sc.parser.ParseUtil;
+import sc.parser.Parselet;
+import sc.parser.Parser;
 import sc.type.CTypeUtil;
 import sc.type.TypeUtil;
 import sc.util.FileUtil;
 import sc.util.StringUtil;
-import sc.layer.Layer;
 
-import java.io.*;
-import java.util.*;
-import sc.dyn.ScheduledJob;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
 
 public abstract class AbstractInterpreter extends EditorContext implements IScheduler {
    static SCLanguage vlang = SCLanguage.INSTANCE;
diff --git a/system/src/sc/lang/JLineInterpreter.java b/system/src/sc/lang/JLineInterpreter.java
index 8cd73973..ae387dc1 100644
--- a/system/src/sc/lang/JLineInterpreter.java
+++ b/system/src/sc/lang/JLineInterpreter.java
@@ -4,10 +4,9 @@
 
 package sc.lang;
 
-import sc.layer.LayeredSystem;
-import jline.console.completer.Completer;
 import jline.console.ConsoleReader;
-import jline.Terminal;
+import jline.console.completer.Completer;
+import sc.layer.LayeredSystem;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/system/src/sc/lang/java/BodyTypeDeclaration.java b/system/src/sc/lang/java/BodyTypeDeclaration.java
index 219453b1..4e25eecc 100755
--- a/system/src/sc/lang/java/BodyTypeDeclaration.java
+++ b/system/src/sc/lang/java/BodyTypeDeclaration.java
@@ -6,29 +6,80 @@
 
 import sc.classfile.CFClass;
 import sc.classfile.CFMethod;
+import sc.dyn.DynUtil;
+import sc.dyn.IDynChildManager;
 import sc.dyn.IDynObjManager;
 import sc.dyn.IDynObject;
-import sc.lang.*;
+import sc.lang.DynObject;
+import sc.lang.IAnnotationProcessor;
+import sc.lang.IDefinitionProcessor;
+import sc.lang.ILanguageModel;
+import sc.lang.INamedNode;
+import sc.lang.ISemanticNode;
+import sc.lang.ISrcStatement;
+import sc.lang.JavaLanguage;
+import sc.lang.SemanticNodeList;
+import sc.lang.SyncAnnotationProcessor;
 import sc.lang.html.Element;
 import sc.lang.js.JSRuntimeProcessor;
-import sc.lang.sc.*;
+import sc.lang.sc.BasicScopeProcessor;
+import sc.lang.sc.IScopeProcessor;
+import sc.lang.sc.ModifyDeclaration;
+import sc.lang.sc.OverrideAssignment;
+import sc.lang.sc.PropertyAssignment;
 import sc.lang.template.Template;
-import sc.lang.template.TemplateStatement;
-import sc.layer.*;
-import sc.obj.*;
+import sc.layer.BuildInfo;
+import sc.layer.IRuntimeProcessor;
+import sc.layer.Layer;
+import sc.layer.LayerConstants;
+import sc.layer.LayerUtil;
+import sc.layer.LayeredSystem;
+import sc.layer.SrcEntry;
+import sc.layer.SrcIndexEntry;
+import sc.layer.TrackingClassLoader;
+import sc.layer.TypeIndexEntry;
+import sc.obj.ComponentImpl;
+import sc.obj.Constant;
+import sc.obj.GlobalScopeDefinition;
+import sc.obj.ScopeContext;
+import sc.obj.ScopeDefinition;
+import sc.obj.SyncMode;
 import sc.parser.ParseUtil;
 import sc.sync.SyncManager;
 import sc.sync.SyncOptions;
 import sc.sync.SyncPropOptions;
 import sc.sync.SyncProperties;
-import sc.type.*;
-import sc.util.*;
-import sc.dyn.DynUtil;
-import sc.dyn.IDynChildManager;
+import sc.type.CTypeUtil;
+import sc.type.DynType;
+import sc.type.IBeanMapper;
+import sc.type.PTypeUtil;
+import sc.type.PropertyMethodType;
+import sc.type.RTypeUtil;
+import sc.type.TypeUtil;
+import sc.util.CoalescedHashMap;
+import sc.util.FileUtil;
+import sc.util.IntCoalescedHashMap;
+import sc.util.LinkedIdentityHashSet;
+import sc.util.PerfMon;
+import sc.util.StringUtil;
 
 import java.io.File;
 import java.io.Serializable;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
 
 /**
  * The base type of TypeDeclaration and EnumConstant.  Because EnumConstants have the bulk of the functionality of a class, this class maintains most of the core functionality of a type.
@@ -940,7 +991,6 @@ public Object getInheritedAnnotation(String annotationName, boolean skipCompiled
       }
       JavaModel model = getJavaModel();
       if (model == null) {
-         System.err.println("*** No model for getInheritedAnnotation");
          return null;
       }
 
@@ -974,7 +1024,6 @@ public ArrayList<Object> getAllInheritedAnnotations(String annotationName, boole
       }
       JavaModel model = getJavaModel();
       if (model == null) {
-         System.err.println("*** No model for getInheritedAnnotation");
          return res;
       }
 
diff --git a/system/src/sc/lang/java/JavaModel.java b/system/src/sc/lang/java/JavaModel.java
index 21610cab..e90040b6 100755
--- a/system/src/sc/lang/java/JavaModel.java
+++ b/system/src/sc/lang/java/JavaModel.java
@@ -2519,7 +2519,6 @@ public void reportError(String error, ISemanticNode source) {
             return;
          }
       }
-      System.err.println(error);
    }
 
    public void reportWarning(String error, ISemanticNode source) {
diff --git a/system/src/sc/lang/java/SelectorExpression.java b/system/src/sc/lang/java/SelectorExpression.java
index 96cb37c7..244d9f57 100644
--- a/system/src/sc/lang/java/SelectorExpression.java
+++ b/system/src/sc/lang/java/SelectorExpression.java
@@ -5,18 +5,17 @@
 package sc.lang.java;
 
 import sc.bind.ArraySelectorBinding;
+import sc.bind.Bind;
+import sc.bind.BindingDirection;
+import sc.bind.IBinding;
 import sc.dyn.DynUtil;
+import sc.lang.ILanguageModel;
 import sc.lang.ISrcStatement;
 import sc.lang.JavaLanguage;
-import sc.lang.ILanguageModel;
-import sc.lang.sc.PropertyAssignment;
-import sc.parser.*;
+import sc.lang.SemanticNodeList;
+import sc.parser.ParseUtil;
 import sc.type.CTypeUtil;
 import sc.type.RTypeUtil;
-import sc.bind.BindingDirection;
-import sc.bind.Bind;
-import sc.bind.IBinding;
-import sc.lang.SemanticNodeList;
 
 import java.util.ArrayList;
 import java.util.IdentityHashMap;
diff --git a/system/src/sc/layer/Layer.java b/system/src/sc/layer/Layer.java
index c90bea30..f76ef95c 100755
--- a/system/src/sc/layer/Layer.java
+++ b/system/src/sc/layer/Layer.java
@@ -2620,7 +2620,7 @@ public SrcEntry getSrcEntry(String absFileName) {
                checkIfStarted();
 
                String rest = absFileName.substring(dir.length());
-               while (rest.startsWith(FileUtil.FILE_SEPARATOR))
+               while (rest.startsWith(File.separator))
                   rest = rest.substring(1);
                File f = srcDirCache.get(rest);
                if (f != null)
diff --git a/system/src/sc/layer/LayerOrderIndex.java b/system/src/sc/layer/LayerOrderIndex.java
index d48aefb6..ec39bd64 100644
--- a/system/src/sc/layer/LayerOrderIndex.java
+++ b/system/src/sc/layer/LayerOrderIndex.java
@@ -8,11 +8,17 @@
 import sc.util.IMessageHandler;
 import sc.util.MessageType;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InvalidClassException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 
 /**
  * One instance per LayeredSystem, used for storing the set of layers that could be loaded into this system
diff --git a/system/src/sc/layer/LayeredSystem.java b/system/src/sc/layer/LayeredSystem.java
index adbbb321..44200624 100755
--- a/system/src/sc/layer/LayeredSystem.java
+++ b/system/src/sc/layer/LayeredSystem.java
@@ -5382,7 +5382,7 @@ else if (l == null) {
             }
          }
 
-         if (options.info)
+         if (options.debug)
             System.out.println("Adding layer: " + layer.layerDirName + (baseLayers != null ? " extends: " + baseLayers : ""));
 
          // No need to build this layer but if we dragged in any base layers, we might need to build this one just to deal with them.