diff --git a/osc-tests.lisp b/osc-tests.lisp
index 01a8781..da5c86d 100644
--- a/osc-tests.lisp
+++ b/osc-tests.lisp
@@ -9,9 +9,11 @@
 ;; Authors
 ;;  - nik gaffney <nik@fo.am>
 
+(in-package :osc)
+
 #+sbcl (require 'sb-bsd-sockets)
 
-(defun osc-write ()
+#+sbcl (defun osc-write ()
   "a basic test function which sends various osc stuff on port 5555"
   (let ((sock (sb-bsd-sockets::make-instance
                'inet-socket
@@ -146,8 +148,8 @@
 
 
 
-(defun osc-read (port)
-  "a basic test function which attempts to decode osc stuff on port xc"
+#+sbcl (defun osc-read (port)
+  "a basic test function which attempts to decode osc stuff on PORT."
   (let ((s (make-instance 'inet-socket
                           :type :datagram
                           :protocol (get-protocol-by-name "udp")))
@@ -159,7 +161,7 @@
     (osc:decode-message buffer)
     ))
 
-                                        ;(osc-decode-message data)
+;;(osc-decode-message data)
 
 (defun osc-ft ()
   (and (eql (osc::DECODE-FLOAT32 #(63 84 32 93))  0.8286188)
@@ -189,8 +191,6 @@
   (setf cons-msg (osc:decode-message packed-msg))
   (osc:encode-message (values-list cons-msg)))
 
-;;
-
 
 #|
 sc3 server
@@ -209,4 +209,5 @@ sc3 server
 
 |#
 
-;; (osc-test)
+(defun run-tests ()
+  (osc-test))
diff --git a/osc.asd b/osc.asd
index 99af41b..9edf66d 100644
--- a/osc.asd
+++ b/osc.asd
@@ -3,29 +3,30 @@
 (in-package #:cl-user)
 
 (asdf:defsystem osc
-    :name "osc"
-    :author "nik gaffney <nik@fo.am>"
-    :licence "GPL v3"
-    :description "The Open Sound Control protocol aka OSC"
-    :version "0.7"
+  :name "osc"
+  :author "nik gaffney <nik@fo.am>"
+  :licence "GPL v3"
+  :description "The Open Sound Control protocol aka OSC"
+  :version "0.7"
+  :depends-on (:usocket)
+  :components
+  ((:file "osc" :depends-on ("osc-data" "osc-time"))
+   (:file "osc-data" :depends-on ("package"))
+   (:file "osc-dispatch" :depends-on ("osc"))
+   (:file "osc-time" :depends-on ("package"))
+   (:file "package")
+   (:module "devices"
+    :depends-on ("package" "osc-data")
     :components
-    ((:file "osc" :depends-on ("osc-data" "osc-time"))
-     (:file "osc-data" :depends-on ("package"))
-     (:file "osc-dispatch" :depends-on ("osc"))
-     (:file "osc-time" :depends-on ("package"))
-     (:file "package")
-     (:module "devices"
-              :depends-on ("package" "osc-data")
-              :components
-              ((:file "socket-functions")
-               (:file "device")
-               (:file "transmitter"
-                      :depends-on ("device"
-                                   "socket-functions"))
-               (:file "listening-device"
-                      :depends-on ("transmitter"))
-               (:file "dispatching-device"
-                      :depends-on ("listening-device"))
-               (:file "client"
-                      :depends-on ("dispatching-device"))
-               (:file "server" :depends-on ("client"))))))
+            ((:file "socket-functions")
+             (:file "device")
+             (:file "transmitter"
+              :depends-on ("device"
+                           "socket-functions"))
+             (:file "listening-device"
+              :depends-on ("transmitter"))
+             (:file "dispatching-device"
+              :depends-on ("listening-device"))
+             (:file "client"
+              :depends-on ("dispatching-device"))
+             (:file "server" :depends-on ("client"))))))
diff --git a/package.lisp b/package.lisp
index 4b96122..9d68e21 100644
--- a/package.lisp
+++ b/package.lisp
@@ -1,5 +1,5 @@
 (defpackage :osc
-  (:use #:cl #:usocket)
+  (:use :cl)
   (:documentation "OSC, the 'Open Sound Control' protocol.")
   (:export
    #:make-message