diff --git a/collects/embedded-gui/doc.txt b/collects/embedded-gui/doc.txt
index f528ab78..2f0affea 100644
--- a/collects/embedded-gui/doc.txt
+++ b/collects/embedded-gui/doc.txt
@@ -257,7 +257,7 @@ alignment<%>.
 
 _stretchable-editor-snip-mixin_ gives an editor snip the
 _stretchable-snip<%>_ interface allowing it to be stretched
-to fit it's alignment-parent<%>'s alloted width. Stretchable
+to fit its alignment-parent<%>'s alloted width. Stretchable
 snips are useful as the snip of a snip-wrapper%.
 
 _stretchable-editor-snip%_ is (stretcable-editor-snip-mixin editor-snip%)
@@ -292,7 +292,7 @@ interface and gives it key bindings to tab ahead and back.
 
 The _set-tabbing_ function sets the tabbing order of
 tabbable-text<%>s by setting each text's set-ahead and
-set-back thunks to point to it's neighbor in the argument
+set-back thunks to point to its neighbor in the argument
 list.
 
 > (set-tabbing a-text ...)
diff --git a/collects/embedded-gui/private/alignment.rkt b/collects/embedded-gui/private/alignment.rkt
index 593b1fc6..3a89451e 100644
--- a/collects/embedded-gui/private/alignment.rkt
+++ b/collects/embedded-gui/private/alignment.rkt
@@ -1,19 +1,19 @@
 #|
-This code computes the sizes for the rectangles in the space using the on dimention
-off dimention method of referencing sizes. This means for example instead of saying
-width we say off dimention for vertical alignment. Inorder to consume and return
+This code computes the sizes for the rectangles in the space using the on dimension
+off dimension method of referencing sizes. This means for example instead of saying
+width we say off dimension for vertical alignment. Inorder to consume and return
 the values in terms of width and height manipulation had to be done. I chose to create
 a struct abs-rect (abstract rectangle) and have code map horizontal and vertical rect
 stucts on to them. This code is a bit long but more readable than the other two options
 I came up with.
   1) define all functions to be letrec bound functions inside align. align then take
-     accessors for the rect struct. The caller of align swaps the order of ondimention
-     and off dimention accessors for vertical or horizontal code. This method does not
+     accessors for the rect struct. The caller of align swaps the order of ondimension
+     and off dimension accessors for vertical or horizontal code. This method does not
      allow the use of the readable, short, consis pattern matching code. As some of the
      matching code is easily removed this may be a good option but a large letrec
      is harder to write tests for.
   2) define a pattern matcher syntax that will match the struct rect but swap the fields
-     based on wich on is the on or off dimention. This would have been shorter but much
+     based on which on is the on or off dimension. This would have been shorter but much
      more confusing.
 The current implementation requires align to map over the rects and allocate new stucts
 for each one on both passing into and returning from stretch-to-fit; This is not a bottle
@@ -138,7 +138,7 @@ neck and it is the most readable solution.
                    (loop rest-rects (+ onpos onsize))))]))))
   
   #;(natural-number? . -> . (-> (union 1 0)))
-  ;; makes a thunk that returns 1 for it's first n applications, zero otherwise
+  ;; makes a thunk that returns 1 for its first n applications, zero otherwise
   (define (waner n)
     (lambda ()
       (if (zero? n)
diff --git a/collects/embedded-gui/scribblings/embedded-gui.scrbl b/collects/embedded-gui/scribblings/embedded-gui.scrbl
index 2d5bd51a..e8c937fe 100644
--- a/collects/embedded-gui/scribblings/embedded-gui.scrbl
+++ b/collects/embedded-gui/scribblings/embedded-gui.scrbl
@@ -81,7 +81,7 @@ t   hat are labeled from a particular set of strings.}
 
 Sets the tabbing order of @scheme[tabbable-text<%>]s by setting each
 text's @method[tabbable-text<%> set-ahead] and
-@method[tabbable-text<%> set-back] thunks to point to it's neighbor in
+@method[tabbable-text<%> set-back] thunks to point to its neighbor in
 the argument list.}
 
 
diff --git a/collects/framework/main.rkt b/collects/framework/main.rkt
index 85c921a5..82b15b12 100644
--- a/collects/framework/main.rkt
+++ b/collects/framework/main.rkt
@@ -802,7 +802,7 @@
                          @scheme[filename].
                          @itemize[
                            @item{If a handler is found, it is applied to
-                                 @scheme[filename] and it's result is the final
+                                 @scheme[filename] and its result is the final
                                  result.}
                            @item{If not, @scheme[make-default] is used.}]}]}
       @item{If @scheme[filename] is @scheme[#f], @scheme[make-default] is
diff --git a/collects/framework/private/color.rkt b/collects/framework/private/color.rkt
index a1203f8f..4120e3aa 100644
--- a/collects/framework/private/color.rkt
+++ b/collects/framework/private/color.rkt
@@ -297,6 +297,14 @@ added get-regions
                        (get-token in in-start-pos in-lexer-mode)
                        (enable-suspend #t)))])
         (unless (eq? 'eof type)
+          (unless (exact-nonnegative-integer? new-token-start)
+            (error 'color:text<%> "expected an exact nonnegative integer for the token start, got ~e" new-token-start))
+          (unless (exact-nonnegative-integer? new-token-end)
+            (error 'color:text<%> "expected an exact nonnegative integer for the token end, got ~e" new-token-end))
+          (unless (exact-nonnegative-integer? backup-delta)
+            (error 'color:text<%> "expected an exact nonnegative integer for the backup delta, got ~e" backup-delta))
+          (unless (0 . < . (- new-token-end new-token-start))
+            (error 'color:text<%> "expected the distance between the start and end position for each token to be positive, but start was ~e and end was ~e" new-token-start new-token-end))
           (enable-suspend #f)
           #; (printf "~a at ~a to ~a\n" lexeme (+ in-start-pos (sub1 new-token-start))
                      (+ in-start-pos (sub1 new-token-end)))
@@ -312,7 +320,7 @@ added get-regions
                             (sp (+ in-start-pos (sub1 new-token-start)))
                             (ep (+ in-start-pos (sub1 new-token-end))))
                        (λ ()
-                          (change-style color sp ep #f)))
+                         (change-style color sp ep #f)))
                      colors)))
             ;; Using the non-spec version takes 3 times as long as the spec
             ;; version.  In other words, the new greatly outweighs the tree
@@ -825,20 +833,23 @@ added get-regions
 
     (define/public (get-token-range position)
       (define-values (tokens ls) (get-tokens-at-position 'get-token-range position))
-      (values (and tokens (+ (lexer-state-start-pos ls) 
-                             (send tokens get-root-start-position)))
-              (and tokens (+ (lexer-state-start-pos ls)
-                             (send tokens get-root-end-position)))))
+      (values (and tokens ls
+                   (+ (lexer-state-start-pos ls)
+                      (send tokens get-root-start-position)))
+              (and tokens ls
+                   (+ (lexer-state-start-pos ls)
+                      (send tokens get-root-end-position)))))
 
     (define/private (get-tokens-at-position who position)
       (when stopped?
         (error who "called on a color:text<%> whose colorer is stopped."))
       (let ([ls (find-ls position)])
-        (and ls
-             (let ([tokens (lexer-state-tokens ls)])
+        (if ls
+            (let ([tokens (lexer-state-tokens ls)])
                (tokenize-to-pos ls position)
                (send tokens search! (- position (lexer-state-start-pos ls)))
-               (values tokens ls)))))
+              (values tokens ls))
+            (values #f #f))))
     
     (define/private (tokenize-to-pos ls position)
       (when (and (not (lexer-state-up-to-date? ls)) 
diff --git a/collects/framework/private/group.rkt b/collects/framework/private/group.rkt
index 81811652..97bb3057 100644
--- a/collects/framework/private/group.rkt
+++ b/collects/framework/private/group.rkt
@@ -256,7 +256,7 @@
       
       (define/public (locate-file name)
         (let* ([normalized
-                ;; allow for the possiblity of filenames that are urls
+                ;; allow for the possibility of filenames that are urls
                 (with-handlers ([(λ (x) #t)
                                  (λ (x) name)])
                   (normal-case-path
diff --git a/collects/framework/private/handler.rkt b/collects/framework/private/handler.rkt
index 3890f7eb..74aeb94d 100644
--- a/collects/framework/private/handler.rkt
+++ b/collects/framework/private/handler.rkt
@@ -209,7 +209,7 @@
   (let ([current-items 
          (map (λ (x) (and (is-a? x labelled-menu-item<%>) (send x get-label)))
               (send menu get-items))]
-        ;; the new-items variable shoudl match up to what install-recent-items actually does when it creates the menu 
+        ;; the new-items variable should match up to what install-recent-items actually does when it creates the menu 
         [new-items 
          (append 
           (for/list ([recent-list-item recently-opened-files])
diff --git a/collects/framework/private/keymap.rkt b/collects/framework/private/keymap.rkt
index ab94d1bd..54fca114 100644
--- a/collects/framework/private/keymap.rkt
+++ b/collects/framework/private/keymap.rkt
@@ -1127,7 +1127,7 @@
           (add "make-read-only" make-read-only)
         
           (add "beginning-of-line" beginning-of-line)
-          (add "selec-to-beginning-of-line" select-to-beginning-of-line)
+          (add "select-to-beginning-of-line" select-to-beginning-of-line)
           
           ; Map keys to functions
           
diff --git a/collects/framework/private/panel.rkt b/collects/framework/private/panel.rkt
index 86d56509..364414c8 100644
--- a/collects/framework/private/panel.rkt
+++ b/collects/framework/private/panel.rkt
@@ -505,3 +505,119 @@
   
   (define horizontal-dragable% (horizontal-dragable-mixin (dragable-mixin panel%)))
 
+(define splitter<%> (interface () split-horizontal split-vertical collapse))
+;; we need a private interface so we can use `generic' because `generic'
+;; doesn't work on mixins
+(define splitter-private<%> (interface () self-vertical? self-horizontal?))
+
+(define splitter-mixin
+  (mixin (area-container<%> dragable<%>) (splitter<%> splitter-private<%>)
+    (super-new)
+    (inherit get-children add-child
+             delete-child
+             change-children
+             begin-container-sequence
+             end-container-sequence)
+
+    (field [horizontal-panel% horizontal-dragable%]
+           [vertical-panel% vertical-dragable%])
+
+    (define/public (self-vertical?)
+      (send this get-vertical?))
+    
+    (define/public (self-horizontal?)
+      (not (send this get-vertical?)))
+
+    ;; insert an item into a list after some element
+    ;; FIXME: this is probably a library function somewhere
+    (define/private (insert-after list before item)
+      (let loop ([so-far '()]
+                 [list list])
+        (cond
+          [(null? list) (reverse so-far)]
+          [(eq? (car list) before) (loop (cons item (cons before so-far))
+                                         (cdr list))]
+          [else (loop (cons (car list) so-far) (cdr list))])))
+
+    ;; replace an element with a list of stuff
+    ;; FIXME: this is probably a library function somewhere
+    (define/private (replace list at stuff)
+      (let loop ([so-far '()]
+                 [list list])
+        (cond
+          [(null? list) (reverse so-far)]
+          [(eq? (car list) at) (append (reverse so-far) stuff (cdr list))]
+          [else (loop (cons (car list) so-far) (cdr list))])))
+
+    ;; remove a canvas and merge split panels if necessary
+    ;; TODO: restore percentages
+    (define/public (collapse canvas)
+      (begin-container-sequence)
+      (for ([child (get-children)])
+        (cond
+          [(eq? child canvas)
+           (when (> (length (get-children)) 1)
+             (change-children
+               (lambda (old-children)
+                 (remq canvas old-children))))]
+          [(is-a? child splitter<%>)
+           (send child collapse canvas)]))
+      (change-children
+        (lambda (old-children)
+          (for/list ([child old-children])
+            (if (and (is-a? child splitter<%>)
+                     (= (length (send child get-children)) 1))
+              (let ()
+                (define single (car (send child get-children)))
+                (send single reparent this)
+                single)
+              child))))
+      (end-container-sequence))
+
+    ;; split a canvas by creating a new editor and either
+    ;; 1) adding it to the panel if the panel is already using the same
+    ;;   orientation as the split that is about to occur
+    ;; 2) create a new panel with the orientation of the split about to
+    ;;   occur and add a new editor
+    ;;
+    ;; in both cases the new editor is returned
+    (define/private (do-split canvas maker orientation? orientation% split)
+      (define new-canvas #f)
+      (for ([child (get-children)])
+        (cond
+          [(eq? child canvas)
+           (begin-container-sequence)
+           (change-children
+             (lambda (old-children)
+               (if (send-generic this orientation?)
+                 (let ([new (maker this)])
+                   (set! new-canvas new)
+                   (insert-after old-children child new))
+                 (let ()
+                   (define container (new (splitter-mixin orientation%)
+                                          [parent this]))
+                   (send canvas reparent container)
+                   (define created (maker container))
+                   (set! new-canvas created)
+                   ;; this throws out the old child but we should probably
+                   ;; try to keep it
+                   (replace old-children child (list container))))))
+           (end-container-sequence)]
+
+          [(is-a? child splitter<%>)
+           (let ([something (send-generic child split canvas maker)])
+             (when something
+               (set! new-canvas something)))]))
+        new-canvas)
+
+    ;; canvas (widget -> editor) -> editor
+    (define/public (split-horizontal canvas maker)
+      (do-split canvas maker (generic splitter-private<%> self-horizontal?)
+                horizontal-panel% (generic splitter<%> split-horizontal)))
+
+    ;; canvas (widget -> editor) -> editor
+    (define/public (split-vertical canvas maker)
+      (do-split canvas maker (generic splitter-private<%> self-vertical?)
+                vertical-panel% (generic splitter<%> split-vertical)))
+
+    ))
diff --git a/collects/framework/private/scheme.rkt b/collects/framework/private/scheme.rkt
index be69a203..6bf517c1 100644
--- a/collects/framework/private/scheme.rkt
+++ b/collects/framework/private/scheme.rkt
@@ -604,7 +604,7 @@
               [(not contains)
                ;; Something went wrong matching. Should we get here?
                (do-indent 0)]
-              #;  ;; disable this to accomodate PLAI programs; return to this when a #lang capability is set up.
+              #;  ;; disable this to accommodate PLAI programs; return to this when a #lang capability is set up.
               [(curley-brace-sexp?)
                ;; when we are directly inside an sexp that uses {}s,
                ;; we indent in a more C-like fashion (to help Scribble)
diff --git a/collects/framework/private/sig.rkt b/collects/framework/private/sig.rkt
index d37a6dd0..5d342e98 100644
--- a/collects/framework/private/sig.rkt
+++ b/collects/framework/private/sig.rkt
@@ -57,7 +57,10 @@
      
      horizontal-dragable<%>
      horizontal-dragable-mixin
-     horizontal-dragable%))
+     horizontal-dragable%
+
+     splitter<%>
+     splitter-mixin))
   (define-signature panel^ extends panel-class^
     (dragable-container-size
      dragable-place-children))
diff --git a/collects/framework/private/text.rkt b/collects/framework/private/text.rkt
index bb9e6c94..47aa6f52 100644
--- a/collects/framework/private/text.rkt
+++ b/collects/framework/private/text.rkt
@@ -1825,6 +1825,9 @@
 (define-struct committer (kr commit-peeker-evt done-evt resp-chan resp-nack))
 
 (define msec-timeout 500)
+
+;; this value (4096) is also mentioned in the test suite (collects/tests/framework/test.rkt)
+;; so if you change it, be sure to change things over there too
 (define output-buffer-full 4096)
 
 (define-local-member-name 
@@ -1873,6 +1876,17 @@
     (send value-sd set-delta-foreground (make-object color% 0 0 175))
     (create-style-name value-style-name value-sd)))
 
+;; data : any
+;; to-insert-chan : (or/c #f channel)
+;;   if to-insert-chan is a channel, this means
+;;   the eventspace handler thread is the one that
+;;   is initiating the communication, so instead of
+;;   queueing a callback to do the update of the editor,
+;;   just send the work back directly and it will be done
+;;   syncronously there. If it is #f, then we queue a callback
+;;   to do the work
+(define-struct data/chan (data to-insert-chan))
+
 (define ports-mixin
   (mixin (wide-snip<%>) (ports<%>)
     (inherit begin-edit-sequence
@@ -2160,7 +2174,7 @@
     
     ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
     ;;
-    ;; output port syncronization code
+    ;; output port synchronization code
     ;;
     
     ;; flush-chan : (channel (evt void))
@@ -2241,7 +2255,7 @@
           (after-io-insertion))))
     
     (define/public (after-io-insertion) (void))
-    
+
     (define output-buffer-thread
       (let ([converter (bytes-open-converter "UTF-8-permissive" "UTF-8")])
         (thread
@@ -2257,13 +2271,16 @@
                    (alarm-evt (+ last-flush msec-timeout))
                    (λ (_)
                      (let-values ([(viable-bytes remaining-queue) (split-queue converter text-to-insert)])
+                       ;; we always queue the work here since the always event means no one waits for the callback
                        (queue-insertion viable-bytes always-evt)
                        (loop remaining-queue (current-inexact-milliseconds))))))
               (handle-evt
                flush-chan
-               (λ (return-evt)
+               (λ (return-evt/to-insert-chan)
                  (let-values ([(viable-bytes remaining-queue) (split-queue converter text-to-insert)])
-                   (queue-insertion viable-bytes return-evt)
+                   (if (channel? return-evt/to-insert-chan)
+                       (channel-put return-evt/to-insert-chan viable-bytes) 
+                       (queue-insertion viable-bytes return-evt/to-insert-chan))
                    (loop remaining-queue (current-inexact-milliseconds)))))
               (handle-evt
                clear-output-chan
@@ -2271,16 +2288,22 @@
                  (loop (empty-queue) (current-inexact-milliseconds))))
               (handle-evt
                write-chan
-               (λ (pr)
+               (λ (pr-pr)
+                 (define return-chan (car pr-pr))
+                 (define pr (cdr pr-pr))
                  (let ([new-text-to-insert (enqueue pr text-to-insert)])
                    (cond
                      [((queue-size text-to-insert) . < . output-buffer-full)
+                      (when return-chan
+                        (channel-put return-chan '()))
                       (loop new-text-to-insert last-flush)]
                      [else
                       (let ([chan (make-channel)])
                         (let-values ([(viable-bytes remaining-queue) 
                                       (split-queue converter new-text-to-insert)])
-                          (queue-insertion viable-bytes (channel-put-evt chan (void)))
+                          (if return-chan
+                              (channel-put return-chan viable-bytes)
+                              (queue-insertion viable-bytes (channel-put-evt chan (void))))
                           (channel-get chan)
                           (loop remaining-queue (current-inexact-milliseconds))))]))))))))))
     
@@ -2300,16 +2323,23 @@
         (λ (to-write start end block/buffer? enable-breaks?)
           (cond
             [(= start end) (flush-proc)]
-            [(eq? (current-thread) (eventspace-handler-thread eventspace))
-             (error 'write-bytes-proc "cannot write to port on eventspace main thread")]
             [else
-             (channel-put write-chan (cons (subbytes to-write start end) style))])
+             (define pair (cons (subbytes to-write start end) style))
+             (cond
+               [(eq? (current-thread) (eventspace-handler-thread eventspace))
+                (define return-channel (make-channel))
+                (thread (λ () (channel-put write-chan (cons return-channel pair))))
+                (do-insertion (channel-get return-channel) #f)]
+               [else
+                (channel-put write-chan (cons #f pair))])])
           (- end start)))
       
       (define (flush-proc)
         (cond
           [(eq? (current-thread) (eventspace-handler-thread eventspace))
-           (error 'flush-proc "cannot flush port on eventspace main thread")]
+           (define to-insert-channel (make-channel))
+           (thread (λ () (channel-put flush-chan to-insert-channel)))
+           (do-insertion (channel-get to-insert-channel) #f)]
           [else
            (sync
             (nack-guard-evt
@@ -2327,17 +2357,18 @@
       
       (define (make-write-special-proc style)
         (λ (special can-buffer? enable-breaks?)
+          (define str/snp (cond
+                            [(string? special) special]
+                            [(is-a? special snip%) special]
+                            [else (format "~s" special)]))
+          (define to-send (cons str/snp style))
           (cond
             [(eq? (current-thread) (eventspace-handler-thread eventspace))
-             (error 'write-bytes-proc "cannot write to port on eventspace main thread")]
+             (define return-chan (make-channel))
+             (thread (λ () (channel-put write-chan (cons return-chan to-send))))
+             (do-insertion (channel-get return-chan) #f)]
             [else
-             (let ([str/snp (cond
-                              [(string? special) special]
-                              [(is-a? special snip%) special]
-                              [else (format "~s" special)])])
-               (channel-put 
-                write-chan 
-                (cons str/snp style)))])
+             (channel-put write-chan (cons #f to-send))])
           #t))
       
       (let* ([add-standard
@@ -3121,7 +3152,7 @@ designates the character that triggers autocompletion
             (show-options word start-pos end-pos completion-cursor)))))
     
     ;; Number -> String
-    ;; The word that ends at the current positon of the editor
+    ;; The word that ends at the current position of the editor
     (define/public (get-word-at current-pos)
       (let ([start-pos (box current-pos)]) 
         (find-wordbreak start-pos #f 'caret)
@@ -3720,7 +3751,7 @@ designates the character that triggers autocompletion
 
 ;; draws line numbers on the left hand side of a text% object
 (define line-numbers-mixin
-  (mixin ((class->interface text%)) (line-numbers<%>)
+  (mixin ((class->interface text%) editor:standard-style-list<%>) (line-numbers<%>)
     (inherit get-visible-line-range
              get-visible-position-range
              last-line
@@ -3732,7 +3763,7 @@ designates the character that triggers autocompletion
              set-padding
              get-padding)
 
-    (init-field [line-numbers-color "black"])
+    (init-field [line-numbers-color #f])
     (init-field [show-line-numbers? #t])
     ;; whether the numbers are aligned on the left or right
     ;; only two values should be 'left or 'right
@@ -3774,9 +3805,12 @@ designates the character that triggers autocompletion
     (define style-change-notify
       (lambda (style) (unless style (setup-padding))))
 
-    (define/private (get-style-font)
-      (let* ([style-list (send this get-style-list)]
-             [std (or (send style-list find-named-style "Standard")
+    (define/private (get-style)
+      (let* ([style-list (editor:get-standard-style-list)]
+             [std (or (send style-list
+                            find-named-style
+                            (editor:get-default-color-style-name))
+                      (send style-list find-named-style "Standard")
                       (send style-list basic-style))])
         ;; If the style changes, we should re-check the width of
         ;; drawn line numbers:
@@ -3785,8 +3819,13 @@ designates the character that triggers autocompletion
           (send style-list notify-on-change style-change-notify)
           ;; Avoid registering multiple notifications:
           (set! notify-registered-in-list style-list))
-        ;; Extract the font from the style:
-        (send std get-font)))
+        std))
+
+    (define/private (get-style-foreground)
+      (send (get-style) get-foreground))
+
+    (define/private (get-style-font)
+      (send (get-style) get-font))
 
     (define-struct saved-dc-state (pen font foreground-color))
     (define/private (save-dc-state dc)
@@ -3799,11 +3838,16 @@ designates the character that triggers autocompletion
       (send dc set-font (saved-dc-state-font dc-state))
       (send dc set-text-foreground (saved-dc-state-foreground-color dc-state)))
 
+    (define/private (get-foreground)
+      (if line-numbers-color
+        (make-object color% line-numbers-color)
+        (get-style-foreground)))
+        
     ;; set the dc stuff to values we want
     (define/private (setup-dc dc)
       (send dc set-pen "black" 1 'solid)
       (send dc set-font (get-style-font))
-      (send dc set-text-foreground (make-object color% line-numbers-color)))
+      (send dc set-text-foreground (get-foreground)))
 
     (define/private (lighter-color color)
       (define (integer number)
@@ -3914,7 +3958,7 @@ designates the character that triggers autocompletion
             (begin
               (send dc set-text-foreground (lighter-color (send dc get-text-foreground)))
               (draw-text view final-x final-y)
-              (send dc set-text-foreground (make-object color% line-numbers-color)))
+              (send dc set-text-foreground (get-foreground)))
             (draw-text view final-x final-y)))
 
         (set! last-paragraph (line-paragraph line))))
diff --git a/collects/mred/info.rkt b/collects/mred/info.rkt
index 9b6cbaad..c522ee60 100644
--- a/collects/mred/info.rkt
+++ b/collects/mred/info.rkt
@@ -1,4 +1,4 @@
 #lang setup/infotab
 
-(define version '(400))
+(define version '(510))
 (define post-install-collection "installer.rkt")
diff --git a/collects/mred/mred-sig.rkt b/collects/mred/mred-sig.rkt
index fc8dec47..ffee1409 100644
--- a/collects/mred/mred-sig.rkt
+++ b/collects/mred/mred-sig.rkt
@@ -91,6 +91,7 @@ get-panel-background
 get-ps-setup-from-user
 get-highlight-background-color
 get-highlight-text-color
+get-resource
 get-text-from-user
 get-the-editor-data-class-list
 get-the-snip-class-list
@@ -210,4 +211,5 @@ window<%>
 write-editor-global-footer
 write-editor-global-header
 write-editor-version
+write-resource
 yield
diff --git a/collects/mred/private/misc.rkt b/collects/mred/private/misc.rkt
index 0df20606..c66afbf0 100644
--- a/collects/mred/private/misc.rkt
+++ b/collects/mred/private/misc.rkt
@@ -48,7 +48,7 @@
       ;; the alarm is immediately ready. This makes `sleep/yield'
       ;; more like `sleep':
       (wx:yield) 
-      ;; Now, realy sleep:
+      ;; Now, really sleep:
       (wx:yield evt))
     (void))
 
diff --git a/collects/mred/private/mred.rkt b/collects/mred/private/mred.rkt
index 72594f60..889008b6 100644
--- a/collects/mred/private/mred.rkt
+++ b/collects/mred/private/mred.rkt
@@ -5,6 +5,7 @@
                  make-base-empty-namespace)
            scheme/class
            racket/draw racket/snip
+           file/resource
            mzlib/etc
 	   (prefix wx: "kernel.ss")
 	   (prefix wx: "wxme/editor.ss")
@@ -169,7 +170,8 @@
           [else #f])))
 
   (provide (all-from racket/draw)
-           (all-from racket/snip))
+           (all-from racket/snip)
+           (all-from file/resource))
 
   (provide button%
 	   canvas%
diff --git a/collects/mred/private/seqcontract.rkt b/collects/mred/private/seqcontract.rkt
index 34fad331..0d22e5d5 100644
--- a/collects/mred/private/seqcontract.rkt
+++ b/collects/mred/private/seqcontract.rkt
@@ -410,13 +410,13 @@ Matthew
      set-before ;SetBefore
      set-after ;SetAfter
      ;ReallyCanEdit -- only when op != wxEDIT_COPY
-     ;Refresh has wierd code checking writeLocked -- what does < 0 mean?
+     ;Refresh has weird code checking writeLocked -- what does < 0 mean?
      do-paste ; DoPaste
      paste ; Paste
      insert-port ; InsertPort
      insert-file ; InsertFile
      read-from-file ; ReadFromFile
-     ; BeginEditSequence ;; -- wierd flag check
-     ; EndEditSequence ;; -- wierd flag check, like BeginEditSequence
+     ; BeginEditSequence ;; -- weird flag check
+     ; EndEditSequence ;; -- weird flag check, like BeginEditSequence
   
   |#
diff --git a/collects/mred/private/wx/cocoa/frame.rkt b/collects/mred/private/wx/cocoa/frame.rkt
index c70d89d2..c6d31f78 100644
--- a/collects/mred/private/wx/cocoa/frame.rkt
+++ b/collects/mred/private/wx/cocoa/frame.rkt
@@ -549,7 +549,7 @@
 
     (define/public (on-activate on?) (void))
 
-    (define/public (set-icon bm1 bm2 [mode 'both]) (void)) ;; FIXME
+    (define/public (set-icon bm1 [bm2 #f] [mode 'both]) (void)) ;; FIXME
 
     (define/override (call-pre-on-event w e)
       (pre-on-event w e))
diff --git a/collects/mred/private/wx/cocoa/gauge.rkt b/collects/mred/private/wx/cocoa/gauge.rkt
index 153b821b..4d349cc2 100644
--- a/collects/mred/private/wx/cocoa/gauge.rkt
+++ b/collects/mred/private/wx/cocoa/gauge.rkt
@@ -32,8 +32,8 @@
 
   (super-new [parent parent]
              [cocoa (let ([cocoa (as-objc-allocation
-                                  ;; Beware that a guage may be finally deallocated in 
-                                  ;; a seperate OS-level thread
+                                  ;; Beware that a gauge may be finally deallocated in 
+                                  ;; a separate OS-level thread
                                   (tell (tell MyProgressIndicator alloc) init))])
                       (tellv cocoa setIndeterminate: #:type _BOOL #f)
                       (tellv cocoa setMaxValue: #:type _double* rng)
diff --git a/collects/mred/private/wx/cocoa/queue.rkt b/collects/mred/private/wx/cocoa/queue.rkt
index 0480478f..f74b25be 100644
--- a/collects/mred/private/wx/cocoa/queue.rkt
+++ b/collects/mred/private/wx/cocoa/queue.rkt
@@ -49,7 +49,7 @@
 
 (define-objc-class MyApplicationDelegate NSObject #:protocols (NSApplicationDelegate)
   []
-  [-a _int (applicationShouldTerminate: [_id app])
+  [-a _NSUInteger (applicationShouldTerminate: [_id app])
       (queue-quit-event)
       0]
   [-a _BOOL (openPreferences: [_id app])
@@ -120,7 +120,7 @@
 (import-class NSEvent)
 (define wake-evt
   (tell NSEvent 
-        otherEventWithType: #:type _int NSApplicationDefined
+        otherEventWithType: #:type _NSUInteger NSApplicationDefined
         location: #:type _NSPoint (make-NSPoint 0.0 0.0)
         modifierFlags: #:type _NSUInteger 0 
         timestamp: #:type _double 0.0
diff --git a/collects/mred/private/wx/cocoa/radio-box.rkt b/collects/mred/private/wx/cocoa/radio-box.rkt
index 237ec581..d52ef155 100644
--- a/collects/mred/private/wx/cocoa/radio-box.rkt
+++ b/collects/mred/private/wx/cocoa/radio-box.rkt
@@ -26,6 +26,9 @@
   #:mixins (FocusResponder KeyMouseResponder CursorDisplayer)
   [wxb]
   (-a _void (clicked: [_id sender])
+      ;; In case we were in 0-item mode, switch to Radio mode to
+      ;; ensure that only one button is selected:
+      (tellv self setAllowsEmptySelection: #:type _BOOL #f)
       (queue-window*-event wxb (lambda (wx) (send wx clicked)))))
 
 (define-objc-class MyImageButtonCell NSButtonCell
@@ -126,16 +129,21 @@
   (define/public (set-selection i)
     (if (= i -1)
         (begin
-          ;; Need to change to NSListModeMatrix to disable all.
-          ;; It seem that we don't have to change the mode back, for some reason.
-          (tellv (get-cocoa) setMode: #:type _int NSListModeMatrix)
+          (tellv (get-cocoa) setAllowsEmptySelection: #:type _BOOL #t)
           (tellv (get-cocoa) deselectAllCells))
-        (tellv (get-cocoa) selectCellAtRow: #:type _NSInteger (if horiz? 0 i)
-               column: #:type _NSInteger (if horiz? i 0))))
+        (begin
+          (tellv (get-cocoa) selectCellAtRow: #:type _NSInteger (if horiz? 0 i)
+                 column: #:type _NSInteger (if horiz? i 0))
+          (tellv (get-cocoa) setAllowsEmptySelection: #:type _BOOL #f))))
   (define/public (get-selection)
-    (if horiz?
-        (tell #:type _NSInteger (get-cocoa) selectedColumn)
-        (tell #:type _NSInteger (get-cocoa) selectedRow)))
+    (let ([c (tell (get-cocoa) selectedCell)]
+          [pos (if horiz?
+                   (tell #:type _NSInteger (get-cocoa) selectedColumn)
+                   (tell #:type _NSInteger (get-cocoa) selectedRow))])
+      (if (and c
+               (positive? (tell #:type _NSInteger c state)))
+          pos
+          -1)))
   (define/public (number) count)
 
   (define/override (maybe-register-as-child parent on?)
diff --git a/collects/mred/private/wx/cocoa/slider.rkt b/collects/mred/private/wx/cocoa/slider.rkt
index c0e820e3..e735287d 100644
--- a/collects/mred/private/wx/cocoa/slider.rkt
+++ b/collects/mred/private/wx/cocoa/slider.rkt
@@ -8,6 +8,7 @@
          "const.rkt"
          "utils.rkt"
          "window.rkt"
+         "queue.rkt"
          "../common/event.rkt"
          "../common/queue.rkt"
          "../common/freeze.rkt"
@@ -158,6 +159,12 @@
   (define/public (update-message [val (get-value)])
     (tellv message-cocoa setTitleWithMnemonic: #:type _NSString (format "~a" val)))
 
+  (inherit get-cocoa-window)
+  (define/override (post-mouse-down)
+    ;; For some reason, dragging a slider disabled mouse-moved
+    ;;  events for the window, so turn them back on:
+    (tellv (get-cocoa-window) setAcceptsMouseMovedEvents: #:type _BOOL #t))
+
   (define/override (maybe-register-as-child parent on?)
     (register-as-child parent on?)))
 
diff --git a/collects/mred/private/wx/cocoa/window.rkt b/collects/mred/private/wx/cocoa/window.rkt
index 409b6ef5..906c0349 100644
--- a/collects/mred/private/wx/cocoa/window.rkt
+++ b/collects/mred/private/wx/cocoa/window.rkt
@@ -98,7 +98,10 @@
   [wxb]
   [-a _void (mouseDown: [_id event]) 
       (unless (do-mouse-event wxb event 'left-down #t #f #f 'right-down)
-        (super-tell #:type _void mouseDown: event))]
+        (super-tell #:type _void mouseDown: event)
+        (let ([wx (->wx wxb)])
+         (when wx
+           (send wx post-mouse-down))))]
   [-a _void (mouseUp: [_id event]) 
       (unless (do-mouse-event wxb event 'left-up #f #f #f 'right-up)
         (super-tell #:type _void mouseUp: event))]
@@ -727,6 +730,8 @@
                              [caps-down #f])
                         #f))
 
+    (define/public (post-mouse-down) (void))
+
     (define/public (on-char s) (void))
     (define/public (on-event m) (void))
     (define/public (queue-on-size) (void))
diff --git a/collects/mred/private/wx/gtk/clipboard.rkt b/collects/mred/private/wx/gtk/clipboard.rkt
index 22264bdf..c049a012 100644
--- a/collects/mred/private/wx/gtk/clipboard.rkt
+++ b/collects/mred/private/wx/gtk/clipboard.rkt
@@ -25,7 +25,6 @@
 
 (define _GtkClipboard (_cpointer 'GtkClipboard))
 (define _GtkDisplay _pointer)
-(define _GtkSelectionData (_cpointer 'GtkSelectionData))
 
 ;; Recent versions of Gtk provide function calls to
 ;;  access data, but use structure when the functions are
@@ -38,6 +37,7 @@
 				    [length _int]
 				    [display _GtkDisplay]))
 				  
+(define _GtkSelectionData _GtkSelectionDataT-pointer)
 
 (define-gdk gdk_atom_intern (_fun _string _gboolean -> _GdkAtom))
 
diff --git a/collects/mred/private/wx/gtk/frame.rkt b/collects/mred/private/wx/gtk/frame.rkt
index 8c43cf8e..aa334ace 100644
--- a/collects/mred/private/wx/gtk/frame.rkt
+++ b/collects/mred/private/wx/gtk/frame.rkt
@@ -216,7 +216,7 @@
         (adjust-client-delta 0 h))
       ;; Hack: calls back into the mred layer to re-compute
       ;;  sizes. By calling this early enough, the frame won't 
-      ;;  grow if it doesn't have to grow to accomodate the menu bar.
+      ;;  grow if it doesn't have to grow to accommodate the menu bar.
       (send this resized))
 
     (define saved-enforcements (vector 0 0 -1 -1))
@@ -334,7 +334,7 @@
 
     (define big-icon #f)
     (define small-icon #f)
-    (define/public (set-icon bm mask [mode 'both])
+    (define/public (set-icon bm [mask #f] [mode 'both])
       (let ([bm (if mask
 		    (let* ([nbm (make-object bitmap%
 					     (send bm get-width)
diff --git a/collects/mred/private/wx/win32/canvas.rkt b/collects/mred/private/wx/win32/canvas.rkt
index 0c5ddba9..a6723720 100644
--- a/collects/mred/private/wx/win32/canvas.rkt
+++ b/collects/mred/private/wx/win32/canvas.rkt
@@ -116,7 +116,7 @@
                                      (if hscroll? WS_HSCROLL 0)
                                      (if vscroll? WS_VSCROLL 0))
                         0 0 w h
-                        (or panel-hwnd (send parent get-hwnd))
+                        (or panel-hwnd (send parent get-client-hwnd))
                         #f
                         hInstance
                         #f))
diff --git a/collects/mred/private/wx/win32/frame.rkt b/collects/mred/private/wx/win32/frame.rkt
index 712f5ffd..8a32696d 100644
--- a/collects/mred/private/wx/win32/frame.rkt
+++ b/collects/mred/private/wx/win32/frame.rkt
@@ -527,7 +527,7 @@
   (define small-hicon #f)
   (define big-hicon #f)
 
-  (define/public (set-icon bm mask [mode 'both])
+  (define/public (set-icon bm [mask #f] [mode 'both])
     (let* ([bg-hbitmap
             (let* ([bm (make-object bitmap% (send bm get-width) (send bm get-height))]
                    [dc (make-object bitmap-dc% bm)])
diff --git a/collects/mred/private/wx/win32/gl-context.rkt b/collects/mred/private/wx/win32/gl-context.rkt
index 3da5c6e3..f7b8f0ce 100644
--- a/collects/mred/private/wx/win32/gl-context.rkt
+++ b/collects/mred/private/wx/win32/gl-context.rkt
@@ -137,7 +137,7 @@
                              PFD_SUPPORT_GDI)
                 (bitwise-ior PFD_DRAW_TO_WINDOW)))
            PFD_TYPE_RGBA ; color type
-           (if offscreen? 32 24) ; prefered color depth
+           (if offscreen? 32 24) ; preferred color depth
            0 0 0 0 0 0 ; color bits (ignored)
            0 ; no alpha buffer
            0 ; alpha bits (ignored)
diff --git a/collects/mred/private/wx/win32/radio-box.rkt b/collects/mred/private/wx/win32/radio-box.rkt
index e395003a..329f5c86 100644
--- a/collects/mred/private/wx/win32/radio-box.rkt
+++ b/collects/mred/private/wx/win32/radio-box.rkt
@@ -49,42 +49,47 @@
     (define label-bitmaps null)
 
     (define radio-hwnds
-      (let loop ([y 0] [w 0] [labels labels])
-        (if (null? labels)
-            (begin
-              (MoveWindow hwnd 0 0 w y #t)
-              null)
-            (let* ([label (car labels)]
-                   [bitmap? (label . is-a? . bitmap%)]
-                   [radio-hwnd 
-                    (CreateWindowExW/control 0
-                                             "PLTBUTTON"
-                                             (if (string? label)
-                                                 label
-                                                 "<image>")
-                                             (bitwise-ior BS_RADIOBUTTON WS_CHILD WS_CLIPSIBLINGS
-                                                          (if bitmap?
-                                                              BS_BITMAP
-                                                              0))
-                                             0 0 0 0
-                                             hwnd
-                                             #f
-                                             hInstance
-                                             #f)])
-              (when bitmap?
-                (let ([hbitmap (bitmap->hbitmap label)])
-                  (set! label-bitmaps (cons hbitmap label-bitmaps))
-                  (SendMessageW radio-hwnd BM_SETIMAGE IMAGE_BITMAP 
-                                (cast hbitmap _HBITMAP _LPARAM))))
-              (ShowWindow radio-hwnd SW_SHOW)
-              (set-control-font font radio-hwnd)
-              (let-values ([(w1 h) 
-                            (auto-size font label 0 0 20 4
-                                       (lambda (w h)
-                                         (MoveWindow radio-hwnd 0 (+ y SEP) w h #t)
-                                         (values w h)))])
-                (cons radio-hwnd
-                      (loop (+ y SEP h) (max w1 w) (cdr labels))))))))
+      (let ([horiz? (memq 'horizontal style)])
+        (let loop ([y 0] [w 0] [labels labels])
+          (if (null? labels)
+              (begin
+                (MoveWindow hwnd 0 0 w y #t)
+                null)
+              (let* ([label (car labels)]
+                     [bitmap? (label . is-a? . bitmap%)]
+                     [radio-hwnd 
+                      (CreateWindowExW/control 0
+                                               "PLTBUTTON"
+                                               (if (string? label)
+                                                   label
+                                                   "<image>")
+                                               (bitwise-ior BS_RADIOBUTTON WS_CHILD WS_CLIPSIBLINGS
+                                                            (if bitmap?
+                                                                BS_BITMAP
+                                                                0))
+                                               0 0 0 0
+                                               hwnd
+                                               #f
+                                               hInstance
+                                               #f)])
+                (when bitmap?
+                  (let ([hbitmap (bitmap->hbitmap label)])
+                    (set! label-bitmaps (cons hbitmap label-bitmaps))
+                    (SendMessageW radio-hwnd BM_SETIMAGE IMAGE_BITMAP 
+                                  (cast hbitmap _HBITMAP _LPARAM))))
+                (ShowWindow radio-hwnd SW_SHOW)
+                (set-control-font font radio-hwnd)
+                (let-values ([(w1 h) 
+                              (auto-size font label 0 0 20 4
+                                         (lambda (w1 h1)
+                                           (if horiz?
+                                               (MoveWindow radio-hwnd (+ w SEP) 0 w1 h1 #t)
+                                               (MoveWindow radio-hwnd 0 (+ y SEP) w1 h1 #t))
+                                           (values w1 h1)))])
+                  (cons radio-hwnd
+                        (loop (if horiz? (max y h) (+ y SEP h))
+                              (if horiz? (+ w SEP w1) (max w1 w))
+                              (cdr labels)))))))))
 
     (unless (= val -1)
       (SendMessageW (list-ref radio-hwnds val) BM_SETCHECK 1 0))
diff --git a/collects/mred/private/wxme/editor-snip.rkt b/collects/mred/private/wxme/editor-snip.rkt
index 14f57369..0d715396 100644
--- a/collects/mred/private/wxme/editor-snip.rkt
+++ b/collects/mred/private/wxme/editor-snip.rkt
@@ -111,7 +111,7 @@
 
     (when (and s-admin
                (has-flag? s-flags USES-BUFFER-PATH))
-      ;; propogate a filename change:
+      ;; propagate a filename change:
       (if (and editor
                (no-permanent-filename? editor))
           (let ([b (send s-admin get-editor)])
diff --git a/collects/mred/private/wxme/mline.rkt b/collects/mred/private/wxme/mline.rkt
index 6d81eac8..0794bb89 100644
--- a/collects/mred/private/wxme/mline.rkt
+++ b/collects/mred/private/wxme/mline.rkt
@@ -1039,7 +1039,7 @@ Debugging tools:
               [next (mline-next mline)])
           (when (or (not (eq? (mline-snip next) asnip))
                     (not (has-flag? (snip->flags (mline-last-snip next)) NEWLINE)))
-            ;; Effect can propogate to more lines, merging the
+            ;; Effect can propagate to more lines, merging the
             ;; next several. (Handle prefixing the remains of the source of
             ;; the extension to this line onto the next line. Implemented
             ;; as the next line eating the next->next line.) 
diff --git a/collects/mred/private/wxme/pasteboard.rkt b/collects/mred/private/wxme/pasteboard.rkt
index f52f7c02..31e5de61 100644
--- a/collects/mred/private/wxme/pasteboard.rkt
+++ b/collects/mred/private/wxme/pasteboard.rkt
@@ -1729,10 +1729,10 @@
               (set-box! h total-height))
             (send s-admin get-view x y w h #t))
       (let ([w (if (w . > . 1000.0)
-                   500.0 ; don't belive it
+                   500.0 ; don't believe it
                    w)]
             [h (if (h . > . 1000.0)
-                   500.0 ; don't belive it
+                   500.0 ; don't believe it
                    h)])
         (values (/ w 2)
                 (/ h 2)))))
diff --git a/collects/mred/private/wxme/text.rkt b/collects/mred/private/wxme/text.rkt
index d29faf08..6a75b34e 100644
--- a/collects/mred/private/wxme/text.rkt
+++ b/collects/mred/private/wxme/text.rkt
@@ -2849,7 +2849,7 @@
                                     (set! write-locked? #t)
                                     (set! flow-locked? #t)
 
-                                    ;; linear seach for snip
+                                    ;; linear search for snip
                                     (let ([topy (mline-get-location line)])
                                       (let loop ([snip (mline-snip line)]
                                                  [X X]
@@ -3159,7 +3159,7 @@
                               (values (mline-last-snip line) (+ horiz (- (mline-w line) (mline-last-w line)))
                                       start #f)]
                              [else
-                              ;; linear seach for snip
+                              ;; linear search for snip
                               (let loop ([snip (mline-snip line)]
                                          [start start]
                                          [horiz horiz]
diff --git a/collects/mrlib/cache-image-snip.rkt b/collects/mrlib/cache-image-snip.rkt
index 1f26d096..88f4b2ce 100644
--- a/collects/mrlib/cache-image-snip.rkt
+++ b/collects/mrlib/cache-image-snip.rkt
@@ -21,7 +21,7 @@
 
     The true meaning of an image is a vector of rationals,
     between 0 & 255, representing color and alpha channel
-    information. The vector's contents are analagous to
+    information. The vector's contents are analogous to
     the last argument to the get-argb-pixels method. That is,
     there are (* 4 w h) entries in the vector for an image
     of width w and height h, and the entries represent the
diff --git a/collects/mrlib/image-core.rkt b/collects/mrlib/image-core.rkt
index 3cbd7890..8df14e75 100644
--- a/collects/mrlib/image-core.rkt
+++ b/collects/mrlib/image-core.rkt
@@ -255,7 +255,7 @@ has been moved out).
                  (or (and (not (skip-image-equality-fast-path))  ;; this is here to make testing more effective
                           (equal? (get-normalized-shape) (send that get-normalized-shape)))
                      (let ([w (+ 1 (round (inexact->exact (bb-right bb))))]    ;; some shapes (ie, rectangles) draw 1 outside the bounding box
-                           [h (+ 1 (round (inexact->exact (bb-bottom bb))))])  ;; so we make the bitmap slightly bigger to accomodate that.
+                           [h (+ 1 (round (inexact->exact (bb-bottom bb))))])  ;; so we make the bitmap slightly bigger to accommodate that.
                        (or ;(zero? w)
                            ;(zero? h)
                            (let ([bm1 (make-bitmap w h #t)]
diff --git a/collects/mrlib/name-message.rkt b/collects/mrlib/name-message.rkt
index bbb0d956..38d94f0b 100644
--- a/collects/mrlib/name-message.rkt
+++ b/collects/mrlib/name-message.rkt
@@ -255,7 +255,7 @@
           (+ border-inset 
              circle-spacer
              button-label-inset
-             (if (eq? (system-type) 'windows) 1 0)  ;; becuase "(define ...)" has the wrong size under windows
+             (if (eq? (system-type) 'windows) 1 0)  ;; because "(define ...)" has the wrong size under windows
              (max 0 (inexact->exact (ceiling tw)))
              button-label-inset
              triangle-width
diff --git a/collects/mrlib/private/aligned-pasteboard/alignment.rkt b/collects/mrlib/private/aligned-pasteboard/alignment.rkt
index 2741e527..3aa0f44b 100644
--- a/collects/mrlib/private/aligned-pasteboard/alignment.rkt
+++ b/collects/mrlib/private/aligned-pasteboard/alignment.rkt
@@ -1,19 +1,19 @@
 #|
-This code computes the sizees for the rectangles in the space using the on dimention
-off dimention method of referencing sizes. This means for example instead of saying
-width we say off dimention for vertical alignment. Inorder to consume and return
+This code computes the sizees for the rectangles in the space using the on dimension
+off dimension method of referencing sizes. This means for example instead of saying
+width we say off dimension for vertical alignment. Inorder to consume and return
 the values in terms of width and height manipulation had to be done. I chose to create
 a struct abs-rect (abstract rectangle) and have code map horizontal and vertical rect
 stucts on to them. This code is a bit long but more readable than the other two options
 I came up with.
   1) define all functions to be letrec bound functions inside align. align then take
-     accessors for the rect struct. The caller of align swaps the order of ondimention
-     and off dimention accessors for vertical or horizontal code. This method does not
+     accessors for the rect struct. The caller of align swaps the order of ondimension
+     and off dimension accessors for vertical or horizontal code. This method does not
      allow the use of the readable, short, consis pattern matching code. As some of the
      matching code is easily removed this may be a good option but a large letrec
      is harder to write tests for.
   2) define a pattern matcher syntax that will match the struct rect but swap the fields
-     based on wich on is the on or off dimention. This would have been shorter but much
+     based on wich on is the on or off dimension. This would have been shorter but much
      more confusing.
 The current implementation requires align to map over the rects and allocate new stucts
 for each one on both passing into and returning from stretch-to-fit; This is not a bottle
@@ -141,7 +141,7 @@ neck and it is the most readable solution.
                    (loop rest-rects (+ onpos onsize))))]))))
   
   ;; waner (natural-number? . -> . (-> (union 1 0)))
-  ;; makes a thunk that returns 1 for it's first n applications, zero otherwise
+  ;; makes a thunk that returns 1 for its first n applications, zero otherwise
   (define (waner n)
     (lambda ()
       (if (zero? n)
diff --git a/collects/mrlib/private/aligned-pasteboard/geometry-managed-pasteboard.rkt b/collects/mrlib/private/aligned-pasteboard/geometry-managed-pasteboard.rkt
index 9d5e2abe..2773b2e7 100644
--- a/collects/mrlib/private/aligned-pasteboard/geometry-managed-pasteboard.rkt
+++ b/collects/mrlib/private/aligned-pasteboard/geometry-managed-pasteboard.rkt
@@ -50,7 +50,7 @@
                        (get-aligned-min-sizes type (find-first-snip)))))
       
       ;; set-algined-min-sizes (-> void?)
-      ;; set the aligned min width and height of the pasteboard based on it's children snips
+      ;; set the aligned min width and height of the pasteboard based on its children snips
       (inherit in-edit-sequence?)
       (define/public (aligned-min-sizes-invalid)
         ;; This in-edit-sequence? is not sound. It causes me to percollate invalidation
diff --git a/collects/mrlib/private/aligned-pasteboard/pasteboard-lib.rkt b/collects/mrlib/private/aligned-pasteboard/pasteboard-lib.rkt
index 50d1ddfc..9d6a0042 100644
--- a/collects/mrlib/private/aligned-pasteboard/pasteboard-lib.rkt
+++ b/collects/mrlib/private/aligned-pasteboard/pasteboard-lib.rkt
@@ -27,7 +27,7 @@
         [else pasteboard])))
 
   ;; gets the canvas or snip that the pasteboard is displayed in
-  ;; status: what if there is more than one canvas? should this be allowed? probablly not.
+  ;; status: what if there is more than one canvas? should this be allowed? probably not.
   (define (pasteboard-parent pasteboard)
     (let ([admin (send pasteboard get-admin)])
       (cond
diff --git a/collects/mrlib/private/image-core-bitmap.rkt b/collects/mrlib/private/image-core-bitmap.rkt
index 9b694af2..6a56a7f0 100644
--- a/collects/mrlib/private/image-core-bitmap.rkt
+++ b/collects/mrlib/private/image-core-bitmap.rkt
@@ -27,7 +27,7 @@ instead of this scaling code, we use the dc<%>'s scaling code.
  
                   
 ; bmbytes: a bytes which represents an image -- 
-; it's size is a multiple of 4, and each
+; its size is a multiple of 4, and each
 ; four consecutive bytes represent alpha,r,g,b.
 
                   
diff --git a/collects/mrlib/scribblings/tex-table.scrbl b/collects/mrlib/scribblings/tex-table.scrbl
index 88a5614d..477fc9f6 100644
--- a/collects/mrlib/scribblings/tex-table.scrbl
+++ b/collects/mrlib/scribblings/tex-table.scrbl
@@ -14,7 +14,7 @@
                            (= (string-length x)
                               1)))))]{
 
-  This is an assocation list mapping the shortcut strings that
+  This is an association list mapping the shortcut strings that
   DrRacket uses with its @tt{control-\} (or @tt{command-\}) strings to
   their corresponding unicode characters. For example, it contains
   this mapping:
diff --git a/collects/scribblings/framework/canvas.scrbl b/collects/scribblings/framework/canvas.scrbl
index ec1cc5c3..af73ef2b 100644
--- a/collects/scribblings/framework/canvas.scrbl
+++ b/collects/scribblings/framework/canvas.scrbl
@@ -53,7 +53,7 @@
   Any
   @scheme[canvas%]
   that matches this interface will automatically
-  resize selected snips when it's size changes. Use
+  resize selected snips when its size changes. Use
   @method[canvas:wide-snip<%> add-tall-snip]
   and
   @method[canvas:wide-snip<%> add-wide-snip]
diff --git a/collects/scribblings/framework/editor.scrbl b/collects/scribblings/framework/editor.scrbl
index 64a353be..3ca6135b 100644
--- a/collects/scribblings/framework/editor.scrbl
+++ b/collects/scribblings/framework/editor.scrbl
@@ -25,7 +25,7 @@
     for more info about edit sequences.
 
   }
-  @defmethod*[(((run-after-edit-sequence (thunk (-> void)) (tag (union symbol? |#f|) |#f|)) void))]{
+  @defmethod*[(((run-after-edit-sequence (thunk (-> void)) (tag (union symbol? #f) #f)) void))]{
     This method is used to install callbacks that will be run after any
     edit-sequence completes.
 
@@ -40,7 +40,7 @@
     @method[editor:basic<%> run-after-edit-sequence]'s argument will be called.
 
   }
-  @defmethod*[(((get-top-level-window) (union |#f| (is-a?/c top-level-window<%>))))]{
+  @defmethod*[(((get-top-level-window) (union #f (is-a?/c top-level-window<%>))))]{
     Returns the 
     @scheme[top-level-window<%>]
     currently associated with this buffer.
@@ -53,7 +53,7 @@
     Returns @scheme[#t] if the file on disk has been modified, by some other program.
 
   }
-  @defmethod*[(((save-file/gui-error (filename (union path |#f|) |#f|) (format (union (quote guess) (quote standard) (quote text) (quote text-force-cr) same copy) (quote same)) (show-errors? boolean |#t|)) boolean?))]{
+  @defmethod*[(((save-file/gui-error (filename (union path #f) #f) (format (union (quote guess) (quote standard) (quote text) (quote text-force-cr) same copy) (quote same)) (show-errors? boolean |#t|)) boolean?))]{
     This method is an alternative to 
     @method[editor<%> save-file]. Rather than showing errors via the original stdout, it
     opens a dialog with an error message showing the error.
@@ -63,7 +63,7 @@
     no error occurred and @scheme[#f] if an error occurred.
 
   }
-  @defmethod*[(((load-file/gui-error (filename (union string |#f|) |#f|) (format (union (quote guess) (quote standard) (quote text) (quote text-force-cr) (quote same) (quote copy)) (quote guess)) (show-errors? boolean |#t|)) boolean?))]{
+  @defmethod*[(((load-file/gui-error (filename (union string #f) #f) (format (union (quote guess) (quote standard) (quote text) (quote text-force-cr) (quote same) (quote copy)) (quote guess)) (show-errors? boolean |#t|)) boolean?))]{
     This method is an alternative to 
     @method[editor<%> load-file]. Rather than showing errors via the original stdout, it
     opens a dialog with an error message showing the error.
@@ -346,8 +346,8 @@
   the filesystem.
 
   The class that this mixin produces uses the same initialization
-  arguments as it's input.
-  @defmethod*[#:mode override (((set-filename (name string) (temp? boolean |#f|)) void))]{
+  arguments as its input.
+  @defmethod*[#:mode override (((set-filename (name string) (temp? boolean #f)) void))]{
 
     Updates the filename on each frame displaying this editor, for each
     frame that matches
@@ -379,7 +379,7 @@
 @definterface[editor:backup-autosave<%> (editor:basic<%>)]{
   Classes matching this interface support backup files and autosaving.
   @defmethod*[(((backup?) boolean?))]{
-    Indicates weather this 
+    Indicates whether this 
     @scheme[editor<%>]
     should be backed up.
 
@@ -392,14 +392,14 @@
 
   }
   @defmethod*[(((autosave?) boolean?))]{
-    Indicates weather this 
+    Indicates whether this 
     @scheme[editor<%>]
     should be autosaved.
 
 
     Returns @scheme[#t].
   }
-  @defmethod*[(((do-autosave) (union |#f| string)))]{
+  @defmethod*[(((do-autosave) (union #f string)))]{
     This method is called to perform the autosaving.
     See also
     @scheme[autosave:register]
diff --git a/collects/scribblings/framework/panel.scrbl b/collects/scribblings/framework/panel.scrbl
index e3cd08d5..20c362e6 100644
--- a/collects/scribblings/framework/panel.scrbl
+++ b/collects/scribblings/framework/panel.scrbl
@@ -174,4 +174,38 @@
 @defclass[panel:vertical-dragable% (panel:vertical-dragable-mixin (panel:dragable-mixin vertical-panel%)) ()]{}
 @defclass[panel:horizontal-dragable% (panel:horizontal-dragable-mixin (panel:dragable-mixin horizontal-panel%)) ()]{}
 
+@definterface[panel:splitter<%> ()]{
+  A panel that implements @scheme[panel:splitter<%>]. Children can be split
+  horizonally or vertically.
+}
+
+@defmixin[panel:splitter-mixin (area-container<%> panel:dragable<%>) (splitter<%>)]{
+  This mixin allows panels to split their children either horizontally or
+  vertically. Children that are split can be further split independant of any
+  other splitting.
+
+  @defmethod[(split-vertical (canvas (instance-of (is-a?/c canvas<%>)))
+                             (maker (-> (instance-of (is-a?/c splitter<%>))
+                                        (instance-of (is-a?/c canvas<%>)))))
+                             (instance-of (is-a?/c canvas<%>))]{
+    Splits the @scheme[canvas] vertically by creating a new instance using
+    @scheme[maker]. This splitter object is passed as the argument to
+    @scheme[maker] and should be used as the @scheme[parent] field of the newly
+    created canvas.
+  }
+
+  @defmethod[(split-horizontal (canvas (instance-of (is-a?/c canvas<%>)))
+                             (maker (-> (instance-of (is-a?/c splitter<%>))
+                                        (instance-of (is-a?/c canvas<%>)))))
+                             (instance-of (is-a?/c canvas<%>))]{
+    Similar to @scheme[split-vertical] but splits horizontally.
+  }
+
+  @defmethod[(collapse (canvas (instance-of (is-a?/c canvas<%>)))) void]{
+    Removes the given @scheme[canvas] from the splitter hierarchy and collapses
+    any split panes as necessary.
+  }
+
+}
+
 @(include-previously-extracted "main-extracts.ss" #rx"^panel:")
diff --git a/collects/scribblings/framework/scheme.scrbl b/collects/scribblings/framework/scheme.scrbl
index 270af5a7..c033f759 100644
--- a/collects/scribblings/framework/scheme.scrbl
+++ b/collects/scribblings/framework/scheme.scrbl
@@ -7,272 +7,251 @@
 @definterface[scheme:sexp-snip<%> ()]{
   @defmethod*[(((get-saved-snips) (listof snip%)))]{
     This returns the list of snips hidden by the sexp snip.
-
   }
 }
 @defclass[scheme:sexp-snip% snip% (scheme:sexp-snip<%> readable-snip<%>)]{
-
-  @defmethod*[#:mode override (((get-text (offset number) (num number) (flattened? boolean |#f|)) string))]{
-
-    Returns the concatenation of the text for all of the hidden
-    snips.
+  @defmethod*[#:mode override
+              (((get-text (offset number) (num number)
+                          (flattened? boolean #f))
+                string))]{
+    Returns the concatenation of the text for all of the hidden snips.
   }
   @defmethod*[#:mode override (((copy) (is-a?/c scheme:sexp-snip%)))]{
-
     Returns a copy of this snip that includes the hidden snips.
   }
   @defmethod*[#:mode override (((write (stream-out editor-stream-out%)) void))]{
-
     Saves the embedded snips
   }
-  @defmethod*[#:mode override (((draw (dc dc<%>) (x real) (y real) (left real) (top real) (right real) (bottom real) (dx real) (dy real) (draw-caret symbol?)) void))]{
-
+  @defmethod*[#:mode override
+              (((draw (dc dc<%>) (x real) (y real)
+                      (left real) (top real) (right real) (bottom real)
+                      (dx real) (dy real) (draw-caret symbol?))
+                void))]{
     Draws brackets with a centered ellipses between them.
   }
-  @defmethod*[#:mode override (((get-extent (dc (is-a?/c dc<%>)) (x real) (y real) (w boxed |#f|) (h boxed |#f|) (descent boxed |#f|) (space boxed |#f|) (lspace boxed |#f|) (rspace boxed |#f|)) void))]{
-
+  @defmethod*[#:mode override
+              (((get-extent (dc (is-a?/c dc<%>)) (x real) (y real)
+                            (w boxed #f) (h boxed #f)
+                            (descent boxed #f) (space boxed #f)
+                            (lspace boxed #f) (rspace boxed #f))
+                void))]{
     Returns a size corresponding to what this snip draws.
   }
 }
 @definterface[scheme:text<%> (text:basic<%> mode:host-text<%> color:text<%>)]{
   Texts matching this interface support Racket mode operations.
   @defmethod*[(((get-limit (start exact-integer)) int))]{
-
-    Returns a limit for backward-matching parenthesis starting at position
-    @scheme[start].
-
+    Returns a limit for backward-matching parenthesis starting at
+    position @scheme[start].
   }
   @defmethod*[(((balance-parens (key-event (instance key-event%))) void))]{
-    This function is called when the user types a close parenthesis in the
-    @scheme[text%]. If the close parenthesis that the user inserted does not match the 
-    corresponding open parenthesis and the @scheme['framework:fixup-parens] preference is
-    @scheme[#t] (see
-    @scheme[preferences:get]) the correct closing parenthesis is inserted.
-    If the @scheme['framework:paren-match] preference is
-    @scheme[#t] (see
-    @scheme[preferences:get]) the matching open parenthesis is flashed.
-
+    This function is called when the user types a close parenthesis in
+    the @scheme[text%].  If the close parenthesis that the user inserted
+    does not match the corresponding open parenthesis and the
+    @scheme['framework:fixup-parens] preference is @scheme[#t] (see
+    @scheme[preferences:get]) the correct closing parenthesis is
+    inserted.  If the @scheme['framework:paren-match] preference is
+    @scheme[#t] (see @scheme[preferences:get]) the matching open
+    parenthesis is flashed.
   }
   @defmethod*[(((tabify-on-return?) boolean?))]{
     The result of this method is used to determine if the return key
     automatically tabs over to the correct position.
 
     Override it to change its behavior.
-
-
   }
-  @defmethod*[(((tabify (start-pos exact-integer (send this text get-start-position))) void))]{
-
+  @defmethod*[(((tabify (start-pos exact-integer
+                                   (send this text get-start-position)))
+                void))]{
     Tabs the line containing by @scheme[start-pos]
-
   }
-  @defmethod*[(((tabify-selection (start exact-integer) (end exact-integer)) void))]{
-
+  @defmethod*[(((tabify-selection (start exact-integer) (end exact-integer))
+                void))]{
     Sets the tabbing for the lines containing positions @scheme[start]
     through @scheme[end].
   }
   @defmethod*[(((tabify-all) void))]{
-
     Tabs all lines.
   }
   @defmethod*[(((insert-return) void))]{
-
-    Inserts a newline into the buffer. If 
-    @method[scheme:text<%> tabify-on-return?]
-    returns @scheme[#t], this will tabify the new line.
+    Inserts a newline into the buffer.  If
+    @method[scheme:text<%> tabify-on-return?] returns @scheme[#t], this
+    will tabify the new line.
   }
-  @defmethod*[(((box-comment-out-selection (start-pos (or/c (symbols 'start) exact-integer?)) (end-pos (or/c (symbols 'end) exact-integer?))) void))]{
-    This method comments out a selection in the text by putting it into a comment box.
+  @defmethod*[(((box-comment-out-selection
+                 (start-pos (or/c (symbols 'start) exact-integer?))
+                 (end-pos (or/c (symbols 'end) exact-integer?)))
+                void))]{
+    This method comments out a selection in the text by putting it into
+    a comment box.
 
+    Removes the region from @scheme[start-pos] to @scheme[end-pos] from
+    the editor and inserts a comment box with that region of text
+    inserted into the box.
 
-    Removes the region from @scheme[start-pos] to @scheme[end-pos]
-    from the editor and inserts a comment box with that region
-    of text inserted into the box.
-
-    If @scheme[start-pos] is @scheme['start], the starting point of
-    the selection is used. If @scheme[end-pos] is @scheme['end],
-    the ending point of the selection is used.
+    If @scheme[start-pos] is @scheme['start], the starting point of the
+    selection is used.  If @scheme[end-pos] is @scheme['end], the ending
+    point of the selection is used.
   }
-  @defmethod*[(((comment-out-selection (start exact-integer) (end exact-integer)) void))]{
-
-    Comments the lines containing positions @scheme[start] through @scheme[end]
-    by inserting a semi-colon at the front of each line.
+  @defmethod*[(((comment-out-selection (start exact-integer)
+                                       (end exact-integer))
+                void))]{
+    Comments the lines containing positions @scheme[start] through
+    @scheme[end] by inserting a semi-colon at the front of each line.
   }
   @defmethod*[(((uncomment-selection (start int) (end int)) void))]{
-
-    Uncomments the lines containing positions @scheme[start] through @scheme[end].
-
+    Uncomments the lines containing positions @scheme[start] through
+    @scheme[end].
   }
-  @defmethod*[(((get-forward-sexp (start exact-integer)) (union |#f| exact-integer)))]{
-
+  @defmethod*[(((get-forward-sexp (start exact-integer))
+                (union #f exact-integer)))]{
     Returns the position of the end of next S-expression after position
     @scheme[start], or @scheme[#f] if there is no appropriate answer.
-
   }
   @defmethod*[(((remove-sexp (start exact-integer)) void))]{
-
-    Forward-deletes the S-expression starting after the position @scheme[start].
-
+    Forward-deletes the S-expression starting after the position
+    @scheme[start].
   }
   @defmethod*[(((forward-sexp (start |#t|)) exact-integer))]{
-
-    Moves forward over the S-expression starting at position @scheme[start].
+    Moves forward over the S-expression starting at position
+    @scheme[start].
   }
   @defmethod*[(((flash-forward-sexp (start-pos exact-integer)) void))]{
-
     Flashes the parenthesis that closes the sexpression at
     @scheme[start-pos].
-
-
   }
-  @defmethod*[(((get-backward-sexp (start exact-integer)) (union exact-integer |#f|)))]{
-
-
+  @defmethod*[(((get-backward-sexp (start exact-integer))
+                (union exact-integer #f)))]{
     Returns the position of the start of the S-expression before or
     containing @scheme[start], or @scheme[#f] if there is no appropriate
     answer.
   }
   @defmethod*[(((flash-backward-sexp (start-pos exact-integer)) void))]{
-
     Flashes the parenthesis that opens the sexpression at
     @scheme[start-pos].
-
   }
   @defmethod*[(((backward-sexp (start-pos exact-integer)) void))]{
     Move the caret backwards one sexpression
 
-
     Moves the caret to the beginning of the sexpression that ends at
     @scheme[start-pos].
   }
-  @defmethod*[(((find-up-sexp (start-pos exact-integer)) (union |#f| exact-integer)))]{
-
-    Returns the position of the beginning of the next sexpression outside
-    the sexpression that contains @scheme[start-pos]. If there is no such
-    sexpression, it returns @scheme[#f].
-
+  @defmethod*[(((find-up-sexp (start-pos exact-integer))
+                (union #f exact-integer)))]{
+    Returns the position of the beginning of the next sexpression
+    outside the sexpression that contains @scheme[start-pos].  If there
+    is no such sexpression, it returns @scheme[#f].
   }
   @defmethod*[(((up-sexp (start exact-integer)) void))]{
-
-    Moves backward out of the S-expression containing the position @scheme[start].
-
+    Moves backward out of the S-expression containing the position
+    @scheme[start].
   }
-  @defmethod*[(((find-down-sexp (start-pos exact-integer)) (union |#f| exact-integer)))]{
-
+  @defmethod*[(((find-down-sexp (start-pos exact-integer))
+                (union #f exact-integer)))]{
     Returns the position of the beginning of the next sexpression inside
-    the sexpression that contains @scheme[start-pos]. If there is no such
-    sexpression, it returns @scheme[#f].
+    the sexpression that contains @scheme[start-pos].  If there is no
+    such sexpression, it returns @scheme[#f].
   }
   @defmethod*[(((down-sexp (start exact-integer)) void))]{
-
-    Moves forward into the next S-expression after the position @scheme[start].
+    Moves forward into the next S-expression after the position
+    @scheme[start].
   }
   @defmethod*[(((remove-parens-forward (start exact-integer)) void))]{
-
     Removes the parentheses from the S-expression starting after the
     position @scheme[start].
-
   }
   @defmethod*[(((select-forward-sexp (start exact-integer)) |#t|))]{
-
     Selects the next S-expression, starting at position @scheme[start].
   }
   @defmethod*[(((select-backward-sexp (start exact-integer)) |#t|))]{
-
-    Selects the previous S-expression, starting at position @scheme[start].
-
+    Selects the previous S-expression, starting at position
+    @scheme[start].
   }
   @defmethod*[(((select-up-sexp (start exact-integer)) |#t|))]{
-
-    Selects the region to the enclosing S-expression, starting at position @scheme[start].
-
+    Selects the region to the enclosing S-expression, starting at
+    position @scheme[start].
   }
   @defmethod*[(((select-down-sexp (start exact-integer)) |#t|))]{
-
-    Selects the region to the next contained S-expression, starting at position @scheme[start].
-
+    Selects the region to the next contained S-expression, starting at
+    position @scheme[start].
   }
   @defmethod*[(((transpose-sexp (start exact-integer)) void))]{
-
-    Swaps the S-expression beginning before the position @scheme[start] with
-    the next S-expression following @scheme[start].
+    Swaps the S-expression beginning before the position @scheme[start]
+    with the next S-expression following @scheme[start].
   }
-  @defmethod*[(((mark-matching-parenthesis (pos exact-positive-integer)) void))]{
-    If the paren after @scheme[pos] is matched, this method
-    highlights it and its matching counterpart in dark green.
-
+  @defmethod*[(((mark-matching-parenthesis (pos exact-positive-integer))
+                void))]{
+    If the paren after @scheme[pos] is matched, this method highlights
+    it and its matching counterpart in dark green.
   }
   @defmethod*[(((get-tab-size) exact-integer))]{
     This method returns the current size of the tabs for scheme mode.
-    See also
-    @method[scheme:text<%> set-tab-size].
-
+    See also @method[scheme:text<%> set-tab-size].
   }
   @defmethod*[(((set-tab-size (new-size exact-integer)) void))]{
-    This method sets the tab size for this 
-    text.
-
+    This method sets the tab size for this text.
   }
   @defmethod*[(((introduce-let-ans) void))]{
-    Adds a let around the current s-expression and a printf into the body
-    of the let.
-
+    Adds a let around the current s-expression and a printf into the
+    body of the let.
   }
   @defmethod*[(((move-sexp-out) void))]{
     Replaces the sexpression surrounding the insertion point with the
     sexpression following the insertion point.
-
   }
 }
-@defmixin[scheme:text-mixin (text:basic<%> mode:host-text<%> color:text<%> text:autocomplete<%>) (scheme:text<%>)]{
+@defmixin[scheme:text-mixin
+          (text:basic<%> mode:host-text<%> color:text<%> text:autocomplete<%>)
+          (scheme:text<%>)]{
   This mixin adds functionality for editing Racket files.
 
   The result of this mixin uses the same initialization arguments as the
   mixin's argument.
-  @defmethod*[#:mode override (((get-word-at (pos positive-exact-integer)) string))]{
-    Returns the word just before @scheme[pos], which is then used
-    as the prefix for auto-completion.
 
+  @defmethod*[#:mode override
+              (((get-word-at (pos positive-exact-integer)) string))]{
+    Returns the word just before @scheme[pos], which is then used as the
+    prefix for auto-completion.
   }
-  
-  @defmethod[#:mode override (get-start-of-line [pos exact-nonnegative-integer?]) exact-nonnegative-integer?]{
-     Returns the first non-whitespace character in the paragraph containing @racket[pos],
-     unless the position is already there, in which case it returns the first position of the paragraph.
+
+  @defmethod[#:mode override
+             (get-start-of-line [pos exact-nonnegative-integer?])
+             exact-nonnegative-integer?]{
+     Returns the first non-whitespace character in the paragraph
+     containing @racket[pos], unless the position is already there, in
+     which case it returns the first position of the paragraph.
   }
 }
 @definterface[scheme:text-mode<%> ()]{
-  The result of
-  @scheme[scheme:text-mode-mixin]
-  implements this interface.
+  The result of @scheme[scheme:text-mode-mixin] implements this
+  interface.
 }
-@defmixin[scheme:text-mode-mixin (color:text-mode<%> mode:surrogate-text<%>) (scheme:text-mode<%>)]{
-  This mixin adds Racket mode functionality
-  to the mode that it is mixed into. The resulting
-  mode assumes that it is only set to an editor
-  that is the result of
-  @scheme[scheme:text-mixin].
-  @defmethod*[#:mode override (((on-disable-surrogate) void))]{
+@defmixin[scheme:text-mode-mixin
+          (color:text-mode<%> mode:surrogate-text<%>)
+          (scheme:text-mode<%>)]{
+  This mixin adds Racket mode functionality to the mode that it is mixed
+  into.  The resulting mode assumes that it is only set to an editor
+  that is the result of @scheme[scheme:text-mixin].
 
-    Removes the scheme keymap (see also
-    @scheme[scheme:get-keymap]) and disables any parenthesis
-    highlighting in the host editor.
+  @defmethod*[#:mode override (((on-disable-surrogate) void))]{
+    Removes the scheme keymap (see also @scheme[scheme:get-keymap]) and
+    disables any parenthesis highlighting in the host editor.
   }
   @defmethod*[#:mode override (((on-enable-surrogate) void))]{
-
-    Adds the scheme keymap (see also
-    @scheme[scheme:get-keymap]) and enables a parenthesis
-    highlighting in the host editor. 
-
+    Adds the scheme keymap (see also @scheme[scheme:get-keymap]) and
+    enables a parenthesis highlighting in the host editor.
   }
 }
 @defmixin[scheme:set-mode-mixin (scheme:text<%> mode:host-text<%>) ()]{
-  This mixin creates a new instance of
-  @scheme[scheme:text-mode%]
-  and installs it, by calling its own
-  @method[mode:host-text<%> set-surrogate]
-  method with the object.
+  This mixin creates a new instance of @scheme[scheme:text-mode%] and
+  installs it, by calling its own @method[mode:host-text<%>
+  set-surrogate] method with the object.
 }
-@defclass[scheme:text% (scheme:set-mode-mixin (scheme:text-mixin (text:autocomplete-mixin (mode:host-text-mixin color:text%)))) ()]{}
+@defclass[scheme:text%
+          (scheme:set-mode-mixin
+           (scheme:text-mixin
+            (text:autocomplete-mixin (mode:host-text-mixin color:text%))))
+          ()]{}
 @defclass[scheme:text-mode% (scheme:text-mode-mixin color:text-mode%) ()]{}
 
 @(include-previously-extracted "main-extracts.ss" #rx"^scheme:")
diff --git a/collects/scribblings/framework/text.scrbl b/collects/scribblings/framework/text.scrbl
index 7aa92bce..494983bc 100644
--- a/collects/scribblings/framework/text.scrbl
+++ b/collects/scribblings/framework/text.scrbl
@@ -107,7 +107,7 @@
     moved. A snip may refuse to be moved by returning @scheme[#f] from
     @method[snip% release-from-owner].
   }
-  @defmethod*[(((initial-autowrap-bitmap) (union |#f| (instance bitmap%))))]{
+  @defmethod*[(((initial-autowrap-bitmap) (union #f (instance bitmap%))))]{
     The result of this method is used as the initial autowrap
     bitmap. Override this method to change the initial 
     @scheme[bitmap%]. See also
@@ -135,7 +135,7 @@
 
   }
   @defmethod[(get-edition-number) exact-nonnegative-integer?]{
-     Returns a number that increments everytime something in
+     Returns a number that increments every time something in
      the editor changes. 
      
      The number is updated in @xmethod[text% after-insert] and
@@ -156,7 +156,7 @@
   objects in the framework.
 
   The class that this mixin produces uses the same initialization
-  arguments as it's input.
+  arguments as its input.
   @defmethod*[#:mode override (((on-paint (before? any/c) (dc (is-a?/c dc<%>)) (left real?) (top real?) (right real?) (bottom real?) (dx real?) (dy real?) (draw-caret (one-of/c (quote no-caret) (quote show-inactive-caret) (quote show-caret)))) void))]{
 
     Draws the rectangles installed by
@@ -488,13 +488,13 @@
   The contents of the two
   editor are kept in sync, as modifications
   to this object happen.
-  @defmethod*[(((get-delegate) (union |#f| (instanceof text%))))]{
+  @defmethod*[(((get-delegate) (union #f (instanceof text%))))]{
     The result of this method is the @scheme[text%] object
     that the contents of this editor are being delegated to, or
     @scheme[#f], if there is none.
 
   }
-  @defmethod*[(((set-delegate (delegate (union |#f| (instanceof text%)))) void))]{
+  @defmethod*[(((set-delegate (delegate (union #f (instanceof text%)))) void))]{
     This method sets the current delegate. 
 
 
@@ -531,7 +531,17 @@
     Creates and returns an instance of 
     @scheme[text:1-pixel-string-snip%].
   }
-  @defmethod*[#:mode override (((get-extent (dc (instanceof dc<%>)) (x real) (y real) (w (box (union non-negative-real-number |#f|)) |#f|) (h (box (union non-negative-real-number |#f|)) |#f|) (descent (box (union non-negative-real-number |#f|)) |#f|) (space (box (union non-negative-real-number |#f|)) |#f|) (lspace (box (union non-negative-real-number |#f|)) |#f|) (rspace (box (union non-negative-real-number |#f|)) |#f|)) void))]{
+  @defmethod*[#:mode override
+              (((get-extent
+                 (dc (instanceof dc<%>))
+                 (x real) (y real)
+                 (w (box (union non-negative-real-number #f)) #f)
+                 (h (box (union non-negative-real-number #f)) #f)
+                 (descent (box (union non-negative-real-number #f)) #f)
+                 (space (box (union non-negative-real-number #f)) #f)
+                 (lspace (box (union non-negative-real-number #f)) #f)
+                 (rspace (box (union non-negative-real-number #f)) #f))
+                void))]{
 
     Sets the descent, space, lspace, and rspace to zero. Sets
     the height to 1. Sets the width to the number of characters
@@ -573,7 +583,7 @@
     Creates and returns an instance of 
     @scheme[text:1-pixel-tab-snip%].
   }
-  @defmethod*[#:mode override (((get-extent (dc (instanceof dc<%>)) (x real) (y real) (w (box (union non-negative-real-number |#f|)) |#f|) (h (box (union non-negative-real-number |#f|)) |#f|) (descent (box (union non-negative-real-number |#f|)) |#f|) (space (box (union non-negative-real-number |#f|)) |#f|) (lspace (box (union non-negative-real-number |#f|)) |#f|) (rspace (box (union non-negative-real-number |#f|)) |#f|)) void))]{
+  @defmethod*[#:mode override (((get-extent (dc (instanceof dc<%>)) (x real) (y real) (w (box (union non-negative-real-number #f)) #f) (h (box (union non-negative-real-number #f)) #f) (descent (box (union non-negative-real-number #f)) #f) (space (box (union non-negative-real-number #f)) #f) (lspace (box (union non-negative-real-number #f)) #f) (rspace (box (union non-negative-real-number #f)) #f)) void))]{
 
     Sets the descent, space, lspace, and rspace to zero. Sets
     the height to 1. Sets the width to the width of tabs as
@@ -818,7 +828,7 @@
 }
 @definterface[text:ports<%> ()]{
   Classes implementing this interface (via the associated
-  mixin) support input and output ports that read from the
+  mixin) support input and output ports that read from and to the
   editor. 
 
   There are two input ports: the normal input port just reads
@@ -826,6 +836,11 @@
   inserts an editor snip into this text and uses input typed
   into the box as input into the port.
 
+  There are three output ports, designed to match stdout, stderr,
+  and a special port for printing values. The only difference
+  between them is the output is rendered in different colors
+  when it comes in via the different ports.
+  
   They create three threads to mediate access to the input and
   output ports (one for each input port and one for all of the
   output ports).
diff --git a/collects/scribblings/gui/gui.scrbl b/collects/scribblings/gui/gui.scrbl
index 4321754b..177cb159 100644
--- a/collects/scribblings/gui/gui.scrbl
+++ b/collects/scribblings/gui/gui.scrbl
@@ -10,7 +10,8 @@
 @defmodule*/no-declare[(racket/gui/base)]{The
 @racketmodname[racket/gui/base] library provides all of the class,
 interface, and procedure bindings defined in this manual, in addition
-to the bindings of @racketmodname[racket/draw].}
+to the bindings of @racketmodname[racket/draw] and 
+@racketmodname[file/resource].}
 
 @defmodulelang*/no-declare[(racket/gui)]{The
 @racketmodname[racket/gui] language combines all bindings of the
diff --git a/collects/scribblings/gui/window-intf.scrbl b/collects/scribblings/gui/window-intf.scrbl
index 3c3645b8..17318469 100644
--- a/collects/scribblings/gui/window-intf.scrbl
+++ b/collects/scribblings/gui/window-intf.scrbl
@@ -374,6 +374,14 @@ Called when this window or a child window receives a keyboard event.
 @method[window<%> on-subwindow-char] method returns @scheme[#f], the event is passed on to the receiver's
  normal key-handling mechanism.
 
+The @scheme[event] argument is the event that was generated for the
+ @scheme[receiver] window.
+
+The atomicity limitation @method[window<%> on-subwindow-event] applies
+ to @method[window<%> on-subwindow-char] as well. That is, an insufficiently cooperative
+ @method[window<%> on-subwindow-char] method can effectively disable
+ a control's handling of key events, even when it returns @racket[#f]
+
 BEWARE: The default
 @xmethod[frame% on-subwindow-char] and
 @xmethod[dialog% on-subwindow-char] methods consume certain keyboard events (e.g., arrow keys, Enter) used
@@ -382,9 +390,6 @@ BEWARE: The default
  reach the ``receiver'' child unless the default frame or dialog
  method is overridden.
 
-The @scheme[event] argument is the event that was generated for the
- @scheme[receiver] window.
-
 }
 @methimpl{
 
@@ -409,6 +414,13 @@ Called when this window or a child window receives a mouse event.
 The @scheme[event] argument is the event that was generated for the
  @scheme[receiver] window.
 
+If the @method[window<%> on-subwindow-event] method chain does not complete
+ atomically (i.e., without requiring other threads to run) or does not complete
+ fast enough, then the corresponding event may not be delivered to a target
+ control, such as a button. In other words, an insufficiently cooperative
+ @method[window<%> on-subwindow-event] method can effectively disable a
+ control's handling of mouse events, even when it returns @racket[#f].
+
 }
 @methimpl{
 
diff --git a/collects/scribblings/gui/wxme.scrbl b/collects/scribblings/gui/wxme.scrbl
index e4926095..875dd4bd 100644
--- a/collects/scribblings/gui/wxme.scrbl
+++ b/collects/scribblings/gui/wxme.scrbl
@@ -3,6 +3,7 @@
           (for-label wxme
                      wxme/editor
                      wxme/image
+                     racket/snip
                      (except-in wxme/comment reader)
                      (except-in wxme/xml reader)
                      (except-in wxme/scheme reader)
@@ -302,7 +303,7 @@ Several compatibility mappings are installed automatically for the
 @racketmodname[wxme] library. They correspond to popular graphical
 elements supported by various versions of DrRacket, including comment
 boxes, fractions, XML boxes, Racket boxes, text boxes, and images
-generated by the ``world'' and ``image'' teachpacks (or, more
+generated by the @racketmodname[htdp/image] teachpack (or, more
 generally, from @racketmodname[mrlib/cache-image-snip]), and test-case
 boxes.
 
@@ -323,7 +324,8 @@ special-comment content is the readable instance. XML, Racket, and
 text boxes similarly produce instances of @racket[editor%] and
 @racket[readable<%>] that expand in the usual way; see
 @racketmodname[wxme/xml], @racketmodname[wxme/scheme], and
-@racket[wxme/text]. Images from the ``world'' and ``image'' teachpacks
+@racket[wxme/text]. Images from the 
+@racketmodname[htdp/image] teachpack
 are packaged as instances of @racket[cache-image%] from the
 @racketmodname[wxme/cache-image] library. Test-case boxes are packaged
 as instances of @racket[test-case%] from the
@@ -353,14 +355,14 @@ editor's content.}
 
 @defmodule[wxme/image]
 
-@defclass[image% object% ()]{
+@defclass[image% image-snip% ()]{
 
 Instantiated for images in a @tech{WXME} stream in text mode.
-
-@defmethod[(get-filename) (or/c bytes? false/c)]{
-
-Returns a filename as bytes, or @racket[#f] if data is available
-instead.}
+This class can just be treated like @racket[image-snip%] and should
+behave just like it, except it has the methods below in addition
+in case old code still needs them. In other words, the methods
+below are provided for backwards compatibility with earlier 
+verisons of Racket.
 
 @defmethod[(get-data) (or/c bytes? false/c)]{
 
@@ -543,7 +545,7 @@ rational numbers.}]
 @defthing[reader (is-a?/c snip-reader<%>)]{
 
 A text-mode reader for images in a WXME stream generated by the
-``image'' and ``world'' teachpacks---or, more generally, by
+@racketmodname[htdp/image] teachpack---or, more generally, by
 @racketmodname[mrlib/cache-image-snip].}]
 
 
diff --git a/collects/tests/framework/README b/collects/tests/framework/README
index 81ad4ef7..a9dae2dd 100644
--- a/collects/tests/framework/README
+++ b/collects/tests/framework/README
@@ -1,7 +1,7 @@
 (#|
                       Framework Test Suite Overview
 
-Each test will rely on the sucessfully completion of all of the ones
+Each test will rely on the successfully completion of all of the ones
 before it. In addition, all test suites rely on the sucessful
 completion of the engine test suites and the mzscheme test suites.
 
@@ -29,7 +29,7 @@ signal failures when there aren't any.
 - load: |# load.rkt #|
 
   | This tests that the advertised ways of loading the framework at
-  | it's components all work.
+  | its components all work.
 
 - exit: |# exit.rkt #|
 
diff --git a/collects/tests/framework/main.rkt b/collects/tests/framework/main.rkt
index e4d3caec..ca6a207d 100644
--- a/collects/tests/framework/main.rkt
+++ b/collects/tests/framework/main.rkt
@@ -58,12 +58,12 @@
  `("Names of the tests; defaults to all non-interactive tests"))
 
 (when (file-exists? preferences-file)
-  (debug-printf admin "   saving preferences file ~s\n" preferences-file)
-  (debug-printf admin "                        to ~s\n" old-preferences-file)
+  (debug-printf admin "   saving prefs file ~a\n" preferences-file)
+  (debug-printf admin "                  to ~a\n" old-preferences-file)
   (if (file-exists? old-preferences-file)
-    (debug-printf admin "   backup preferences file exists, using that one\n")
+    (debug-printf admin "   backup prefs file exists, using that one\n")
     (begin (copy-file preferences-file old-preferences-file)
-           (debug-printf admin "   saved preferences file\n"))))
+           (debug-printf admin "   saved prefs file\n"))))
 
 (define jumped-out-tests '())
 
@@ -96,12 +96,12 @@
 (debug-printf schedule "ran ~a test~a\n" number-of-tests (if (= 1 number-of-tests) "" "s"))
 
 (when (file-exists? old-preferences-file)
-  (debug-printf admin "   restoring preferences file ~s\n" old-preferences-file)
-  (debug-printf admin "                           to ~s\n" preferences-file)
+  (debug-printf admin "   restoring prefs file ~a\n" old-preferences-file)
+  (debug-printf admin "                     to ~a\n" preferences-file)
   (delete-file preferences-file)
   (copy-file old-preferences-file preferences-file)
   (delete-file old-preferences-file)
-  (debug-printf admin "   restored preferences file\n"))
+  (debug-printf admin "   restored prefs file\n"))
 
 (shutdown-listener)
 
diff --git a/collects/tests/framework/test-suite-utils.rkt b/collects/tests/framework/test-suite-utils.rkt
index dd5ec200..3802d829 100644
--- a/collects/tests/framework/test-suite-utils.rkt
+++ b/collects/tests/framework/test-suite-utils.rkt
@@ -144,8 +144,11 @@
     (send-sexp-to-mred
      `(let ([thunk (lambda () ,sexp)]  ;; low tech hygiene
             [c (make-channel)])
-        (queue-callback (lambda () (channel-put c (thunk))))
-        (channel-get c)))))
+        (queue-callback (lambda () (channel-put c (with-handlers ((exn:fail? (λ (x) (list 'exn x)))) (list 'normal (thunk))))))
+        (let ([res (channel-get c)])
+          (if (eq? (list-ref res 0) 'normal)
+              (list-ref res 1)
+              (raise (list-ref res 1))))))))
 
 (define re:tcp-read-error (regexp "tcp-read:"))
 (define re:tcp-write-error (regexp "tcp-write:"))
diff --git a/collects/tests/framework/text.rkt b/collects/tests/framework/text.rkt
index 25dbaa5e..b3ae4463 100644
--- a/collects/tests/framework/text.rkt
+++ b/collects/tests/framework/text.rkt
@@ -196,3 +196,145 @@
        (send dc clear)
        (send t print-to-dc dc 1)
        'no-error))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;;  text:ports
+;;
+
+;; there is an internal buffer of this size, so writes that are larger and smaller are interesting
+(define buffer-size 4096)
+
+(let ([big-str (build-string (* buffer-size 2) (λ (i) (integer->char (+ (modulo i 26) (char->integer #\a)))))]
+      [non-ascii-str "λαβ一二三四五"])
+  
+  (define (do/separate-thread str mtd)
+    (queue-sexp-to-mred
+     `(let* ([t (new (text:ports-mixin text:wide-snip%))]
+             [op (send t ,mtd)]
+             [exn #f])
+        (yield
+         (thread
+          (λ () 
+            (with-handlers ((exn:fail? (λ (x) (set! exn x))))
+              (display ,str op)
+              (flush-output op)))))
+        (when exn (raise exn))
+        (send t get-text 0 (send t last-position)))))
+  
+  (test 
+   'text:ports%.1
+   (λ (x) (equal? x "abc"))
+   (λ () (do/separate-thread "abc" 'get-out-port)))
+  
+  (test 
+   'text:ports%.2
+   (λ (x) (equal? x big-str))
+   (λ () (do/separate-thread big-str 'get-out-port)))
+  
+  (test 
+   'text:ports%.3
+   (λ (x) (equal? x non-ascii-str))
+   (λ () (do/separate-thread non-ascii-str 'get-out-port)))
+  
+  (test 
+   'text:ports%.4
+   (λ (x) (equal? x "abc"))
+   (λ () (do/separate-thread "abc" 'get-err-port)))
+  
+  (test 
+   'text:ports%.5
+   (λ (x) (equal? x big-str))
+   (λ () (do/separate-thread big-str 'get-err-port)))
+  
+  (test 
+   'text:ports%.6
+   (λ (x) (equal? x non-ascii-str))
+   (λ () (do/separate-thread non-ascii-str 'get-err-port)))
+  
+  
+  (test 
+   'text:ports%.7
+   (λ (x) (equal? x "abc"))
+   (λ () (do/separate-thread "abc" 'get-value-port)))
+  
+  (test 
+   'text:ports%.8
+   (λ (x) (equal? x big-str))
+   (λ () (do/separate-thread big-str 'get-value-port)))
+  
+  (test 
+   'text:ports%.9
+   (λ (x) (equal? x non-ascii-str))
+   (λ () (do/separate-thread non-ascii-str 'get-value-port)))
+  
+  ;; display the big string, one char at a time
+  (test
+   'text:ports%.10
+   (λ (x) (equal? x big-str))
+   (λ () 
+     (queue-sexp-to-mred
+      `(let* ([t (new (text:ports-mixin text:wide-snip%))]
+              [op (send t get-out-port)]
+              [big-str ,big-str]
+              [exn #f])
+         (yield
+          (thread
+           (λ () 
+             (with-handlers ((exn:fail? (λ (x) (set! exn x))))
+               (let loop ([i 0])
+                 (when (< i (string-length big-str))
+                   (display (string-ref big-str i) op)
+                   (loop (+ i 1))))
+               (flush-output op)))))
+         (when exn (raise exn))
+         (send t get-text 0 (send t last-position))))))
+     
+  ;; the next tests test the interaction when the current
+  ;; thread is the same as the handler thread of the eventspace
+  ;; where the text was created
+  
+  (test 
+   'text:ports%.thd1
+   (λ (x) (equal? x "abc"))
+   (λ ()
+     (queue-sexp-to-mred
+      `(let* ([t (new (text:ports-mixin text:wide-snip%))]
+              [op (send t get-out-port)]
+              [exn #f])
+         (display "abc" op)
+         (flush-output op)
+         (send t get-text 0 (send t last-position))))))
+  
+  (test 
+   'text:ports%.thd2
+   (λ (x) (equal? x big-str))
+   (λ ()
+     (queue-sexp-to-mred
+      `(let* ([t (new (text:ports-mixin text:wide-snip%))]
+              [op (send t get-out-port)])
+         (display ,big-str op)
+         (flush-output op)
+         (send t get-text 0 (send t last-position))))))
+  
+  (test 
+   'text:ports%.thd3
+   (λ (x) (equal? x non-ascii-str))
+   (λ ()
+     (queue-sexp-to-mred
+      `(let* ([t (new (text:ports-mixin text:wide-snip%))]
+              [op (send t get-out-port)])
+         (display ,non-ascii-str op)
+         (flush-output op)
+         (send t get-text 0 (send t last-position))))))
+  
+  (test 
+   'text:ports%.thd4
+   (λ (x) (equal? x non-ascii-str))
+   (λ ()
+     (queue-sexp-to-mred
+      `(let* ([t (new (text:ports-mixin text:wide-snip%))]
+              [op (send t get-out-port)])
+         (display ,non-ascii-str op)
+         (flush-output op)
+         (send t get-text 0 (send t last-position)))))))
diff --git a/collects/tests/gracket/image-snip-unmarshalling.rkt b/collects/tests/gracket/image-snip-unmarshalling.rkt
new file mode 100644
index 00000000..cb8a4937
--- /dev/null
+++ b/collects/tests/gracket/image-snip-unmarshalling.rkt
@@ -0,0 +1,142 @@
+#lang racket/gui
+(require wxme
+         wxme/image)
+
+#|
+
+This file tests the wxme image-snip reader against the normal
+image-snip reader (ie image-snip-class%'s read method)
+
+It creates a bunch of different image-snip% objects 
+(the try-perms and below functions)
+and then feeds them thru both paths to get two new image snips 
+(in the beginning of test-wxme-image-snip-reader/proc)
+and compares a bunch of properties of them
+(the end of that function).
+
+|#
+
+(define-syntax (test-wxme-image-snip-reader stx)
+  (syntax-case stx ()
+    [(_ is)
+     (with-syntax ([line (syntax-line stx)])
+       #'(test-wxme-image-snip-reader/proc line is))]))
+
+(define tests 0)
+(define (test-wxme-image-snip-reader/proc line is)
+  (set! tests (+ tests 1))
+  (define t (new text%))
+  (send t insert is)
+  (define sp (open-output-string))
+  (void (send t save-port sp))
+  (define wp (wxme-port->port (open-input-string (get-output-string sp))))
+  (define wxme-is (read-char-or-special wp))
+  
+  (define t2 (new text%))
+  (send t2 insert-port (open-input-string (get-output-string sp)))
+  (define copy-is (send t2 find-first-snip))
+  
+  (define (warn . args)
+    (fprintf (current-error-port)
+             (string-append (format "FAILED test-wxme-image-snip-reader.rkt line ~a: " line)
+                            (apply format args))))
+  
+  (define-syntax-rule (cmp mtd) (cmp/proc (λ (x) (send x mtd)) 'mtd))
+  (define (cmp/proc call-mtd mtd)
+    (let ([is-ans (call-mtd is)]
+          [wxme-is-ans (call-mtd wxme-is)]
+          [copy-is-ans (call-mtd copy-is)])
+      (unless (same? copy-is-ans wxme-is-ans)
+        (warn "~a returned different results; copy-is: ~s wxme-is: ~s\n"
+              mtd
+              copy-is-ans 
+              wxme-is-ans))
+      #;
+      (unless (same? is-ans copy-is-ans)
+        (warn "~a returned different results; is: ~s copy-is: ~s\n"
+              mtd
+              is-ans 
+              copy-is-ans))))
+  
+  (when (is-a? is image%)
+    (warn "the input image-snip% is an image%\n"))
+  
+  (unless (is-a? wxme-is image%)
+    (warn "new image snip is not an image%\n"))
+  
+  (cmp get-filename)
+  (cmp get-filetype)
+  (cmp get-bitmap)
+  (cmp get-bitmap-mask))
+
+(define (same? x y)
+  (cond
+    [(and (is-a? x bitmap%)
+          (is-a? y bitmap%))
+     (and (= (send x get-width)
+             (send y get-width))
+          (= (send x get-height)
+             (send y get-height))
+          (= (send x get-depth)
+             (send y get-depth))
+          (check? (bitmap->bytes x #f)
+                  (bitmap->bytes y #f)
+                  'bitmap/#f)
+          (check? (bitmap->bytes x #t)
+                  (bitmap->bytes y #t)
+                  'bitmap/#t))]
+    [else (equal? x y)]))
+
+
+(define (check? a b what)
+  (cond
+    [(equal? a b) #t]
+    [else 
+     ;(fprintf (current-error-port) "checking ~s, doesn't match\n~s\nvs\n~s\n\n" what a b)
+     #f]))
+
+(define (bitmap->bytes bmp alpha?)
+  (define w (send bmp get-width))
+  (define h (send bmp get-height))
+  (define bytes (make-bytes (* 4 w h) 0))
+  (send bmp get-argb-pixels 0 0 w h bytes alpha?)
+  bytes)
+
+(define (try-perms files kinds relative-path?s inline?s)
+  (for* ([file (in-list files)]
+         [kind (in-list kinds)]
+         [relative-path? (in-list relative-path?s)]
+         [inline? (in-list inline?s)])
+    (test-wxme-image-snip-reader (make-object image-snip% file kind relative-path? inline?))))
+
+(try-perms (list (collection-file-path "b-run.png" "icons"))
+           '(unknown unknown/mask unknown/alpha
+                     png png/mask png/alpha)
+           '(#f)
+           '(#f #t))
+
+(parameterize ([current-directory (collection-path "icons")])
+  (try-perms (list "b-run.png")
+             '(unknown unknown/mask unknown/alpha
+                       png png/mask png/alpha)
+             '(#f)
+             '(#f #t)))
+
+(define (draw-circle bm)
+  (define bdc (make-object bitmap-dc% bm))
+  (send bdc set-smoothing 'smoothed)
+  (send bdc set-brush "red" 'solid)
+  (send bdc draw-ellipse 1 1 8 8)
+  (send bdc set-bitmap #f))
+
+(let ([bm (make-bitmap 10 10 #f)])
+  (draw-circle bm)
+  (test-wxme-image-snip-reader (make-object image-snip% bm))
+  (test-wxme-image-snip-reader (make-object image-snip% bm #f))
+  (test-wxme-image-snip-reader (make-object image-snip% bm bm)))
+
+(let ([bm (make-bitmap 10 10)])
+  (draw-circle bm)
+  (test-wxme-image-snip-reader (make-object image-snip% bm)))
+
+(printf "ran ~a tests\n" tests)
diff --git a/collects/tests/gracket/wxme.rkt b/collects/tests/gracket/wxme.rkt
index 4208af35..c436b39f 100644
--- a/collects/tests/gracket/wxme.rkt
+++ b/collects/tests/gracket/wxme.rkt
@@ -1347,4 +1347,23 @@
 
 ;; ----------------------------------------
 
+(let ()
+  (define (mk) (make-object image-snip% (collection-file-path "b-run.png" "icons") 'unknown #f #f))
+  
+  (define is (mk))
+  (define copy-is
+    (let ()
+      (define sp (open-output-string))
+      (define t (new text%))
+      (send t insert (mk))
+      (send t save-port sp)
+      (define t2 (new text%))
+      (send t2 insert-port (open-input-string (get-output-string sp)))
+      (send t2 find-first-snip)))
+  
+  (expect (send (mk) get-filename)
+          (send copy-is get-filename)))
+
+;; ----------------------------------------
+
 (done)
diff --git a/doc/release-notes/gracket/HISTORY.txt b/doc/release-notes/gracket/HISTORY.txt
index 75948fb3..2bffa405 100644
--- a/doc/release-notes/gracket/HISTORY.txt
+++ b/doc/release-notes/gracket/HISTORY.txt
@@ -373,7 +373,7 @@ Version 206p1, February 2004
  Fixed printing scale for Windows NT/2000/XP
 
 
-Version 206, Janurary 2004
+Version 206, January 2004
 
 Drawing:
  Changed get-argb-pixels and set-argb-pixels to row-major order:
@@ -1285,7 +1285,7 @@ System:
 
   Changed force-redraw to ignore refresh requests when the
   redraw-requesting window is not shown. Redraw requests are now
-  propogated to the top-level frame or dialog via child-redraw-request.
+  propagated to the top-level frame or dialog via child-redraw-request.
 - if your application is unititized, then you need to change the
   startup procedure. See the application startup section in the
   toolbox manual.
@@ -1655,7 +1655,7 @@ Bug fixes, especially Motif and memory bugs
 Rewrote editor line-maintenance
 Faster caret updating
 Upgraded garbage collector
-File format changed to accomodate nested buffers with
+File format changed to accommodate nested buffers with
   separate style lists
 Standard system standardized
 Code changes for compiling on MSWindows (almost works...)
diff --git a/doc/release-notes/gracket/MrEd_100_Framework.txt b/doc/release-notes/gracket/MrEd_100_Framework.txt
index 2c062d7c..e3d26796 100644
--- a/doc/release-notes/gracket/MrEd_100_Framework.txt
+++ b/doc/release-notes/gracket/MrEd_100_Framework.txt
@@ -115,7 +115,7 @@ The moved functions and classes are:
   mred:graph-pasteboard% 
   mred:node-snip% 
 
-The remaining existant classes: 
+The remaining existent classes: 
   
   frame:empty% = (frame:make-empty% frame%)
   frame:standard-menus% = (frame:make-standard-menus% frame:empty%)
@@ -294,4 +294,4 @@ NOTE: some used but non-existant interfaces from mred engine:
   
   snip:make-basic-style% : snip<%> -> snip<%>
 
-  scheme:make-text% : text:basic<%> -> scheme:text<%>
\ No newline at end of file
+  scheme:make-text% : text:basic<%> -> scheme:text<%>
diff --git a/doc/release-notes/racket/Draw_and_GUI_5_1.txt b/doc/release-notes/racket/Draw_and_GUI_5_1.txt
index d44cc4d9..75d625c2 100644
--- a/doc/release-notes/racket/Draw_and_GUI_5_1.txt
+++ b/doc/release-notes/racket/Draw_and_GUI_5_1.txt
@@ -17,7 +17,7 @@ API:
    Racket.
 
    The GRacket executable still offers some additional GUI-specific
-   functiontality however. Most notably, GRacket is a GUI application
+   functionality however. Most notably, GRacket is a GUI application
    under Windows (as opposed to a console application, which is
    launched slightly differently by the OS), GRacket is a bundle under
    Mac OS X (so the dock icon is the Racket logo, for example), and
@@ -91,8 +91,8 @@ The old translation and scaling transformations apply after the
 initial matrix. The new rotation transformation applies after the
 other transformations. This layering is redundant, since all
 transformations can be expressed in a single matrix, but it is
-backward-compatibile. Methods like `get-translation',
-`set-translation', `scale', etc. help hide the reundancy.
+backward-compatible. Methods like `get-translation',
+`set-translation', `scale', etc. help hide the redundancy.
 
 
 PostScript, PDF, and SVG Drawing Contexts
@@ -150,18 +150,32 @@ into the control.
 
 Event callbacks are delimited by a continuation prompt using the
 default continuation prompt tag. As a result, continuations can be
-usufully captured during one event callback and applied during other
+usefully captured during one event callback and applied during other
 callbacks or outside of an even callback. The continuation barrier and
 jump-defeating `dynamic-wind' that formerly guarded callbacks has been
 removed.
 
+The `on-subwindow-char' and `on-subwindow-event' methods for controls
+are somewhat more restricted in the actions they can take without
+disabling the control's handling of key and mouse events. See the
+documentation for more information.
+
+
+Registry Functions
+-----------------
+
+The `get-resource' and `write-resource' functions have moved to a
+`file/resource' library that is re-exported by `racket/gui/base'.
+These function now work only for reading and writing the Windows
+registry or ".ini" files; they report failure for other platforms.
+
 
 Removed Functions
 -----------------
 
-The `write-resource, `get-reource', and `send-event' functions have
-been removed from `racket/gui/base'. If there is any demand for the
-removed functionality, it will be implemented in a new library.
+The `send-event' function has been removed from `racket/gui/base'. If
+there is any demand for the removed functionality, it will be
+implemented in a new library.
 
 The `current-ps-afm-file-paths' and `current-ps-cmap-file-paths'
 functions have been removed, because they no longer apply. PostScript