diff --git a/src/mainclient/init.janet b/src/mainclient/init.janet
index 6ccb332b..a73554a1 100644
--- a/src/mainclient/init.janet
+++ b/src/mainclient/init.janet
@@ -12,7 +12,7 @@
   # Flag handlers
   (def handlers :private
     {"h" (fn [&]
-           (print "usage: " (get process/args 0) " [options] scripts...")
+           (print "usage: " (get process/args 0) " [options] script args...")
            (print
              `Options are:
   -h Show this help
@@ -22,6 +22,7 @@
   -r Enter the repl after running all scripts
   -p Keep on executing if there is a top level error (persistent)
   -q Hide prompt, logo, and repl output (quiet)
+  -l Execute code in a file before running the main script
   -- Stop handling options`)
            (os/exit 0)
            1)
@@ -31,6 +32,10 @@
      "p" (fn [&] (set *exit-on-error* false) 1)
      "q" (fn [&] (set *quiet* true) 1)
      "-" (fn [&] (set *handleopts* false) 1)
+     "l" (fn [i &]
+           (import* *env* (get process/args (+ i 1))
+                    :prefix "" :exit *exit-on-error*)
+           2)
      "e" (fn [i &]
            (set *no-file* false)
            (eval-string (get process/args (+ i 1)))
@@ -50,11 +55,11 @@
       (do
         (set *no-file* false)
         (import* *env* arg :prefix "" :exit *exit-on-error*)
-        (++ i))))
+        (set i lenargs))))
 
   (when (or *should-repl* *no-file*)
     (if-not *quiet*
-      (print "Janet " janet/version "-" janet/build "  Copyright (C) 2017-2018 Calvin Rose"))
+      (print "Janet " janet/version "-" janet/build "  Copyright (C) 2017-2019 Calvin Rose"))
     (defn noprompt [_] "")
     (defn getprompt [p]
       (def offset (parser/where p))
diff --git a/tools/highlight.janet b/tools/highlight.janet
index dc7e258f..7c881ca7 100644
--- a/tools/highlight.janet
+++ b/tools/highlight.janet
@@ -162,9 +162,9 @@
 (defn html
   "Highlight janet source code and output HTML."
   [source]
-  (string "<pre class=\"j-main\">"
+  (string "<pre class=\"j-main\"><code>"
           (0 (peg/match html-grammar source))
-          "</pre>"))
+          "</code></pre>"))
 
 (defn html-file
   "Highlight a janet file and print out a highlighted HTML version