diff --git a/app/Base.java b/app/Base.java
index 34d01cc44..454150e3b 100644
--- a/app/Base.java
+++ b/app/Base.java
@@ -51,7 +51,7 @@ import com.ice.jni.registry.*;
  */
 public class Base {
   static final int VERSION = 1;
-  static final String VERSION_NAME = "0001 pre-alpha";
+  static final String VERSION_NAME = "0002";
   
   static public int platform;
   
diff --git a/build/macosx/make.sh b/build/macosx/make.sh
index 363d38a23..4e82f986f 100755
--- a/build/macosx/make.sh
+++ b/build/macosx/make.sh
@@ -24,9 +24,10 @@ else
   mkdir -p work/classes/processing/app/tools
   mkdir -p work/lib/build
 
+  cp ../../lib/librxtxSerial.jnilib work/
+
   # to have a copy of this guy around for messing with
   echo Copying Arduino.app...
-
   cp -pR dist/Arduino.app work/
   # cvs doesn't seem to want to honor the +x bit 
   chmod +x work/Arduino.app/Contents/MacOS/JavaApplicationStub
diff --git a/core/pins_arduino.c b/core/pins_arduino.c
index d9a77e385..6d29a4160 100755
--- a/core/pins_arduino.c
+++ b/core/pins_arduino.c
@@ -23,7 +23,6 @@
 */
 
 #include <avr/io.h>
-#include "BConstants.h"
 #include "wiring.h"
 
 // On the Arduino board, digital pins are also used
diff --git a/core/pins_atmega8.c b/core/pins_atmega8.c
index 7a3c1ce29..d9996e68f 100755
--- a/core/pins_atmega8.c
+++ b/core/pins_atmega8.c
@@ -23,7 +23,6 @@
 */
 
 #include <avr/io.h>
-#include "BConstants.h"
 #include "wiring.h"
 
 // We map the pin numbers passed to digitalRead() or
diff --git a/core/wiring.c b/core/wiring.c
index 5dbcc7909..d82950e2d 100755
--- a/core/wiring.c
+++ b/core/wiring.c
@@ -46,7 +46,6 @@
 // it so our delay can be in milliseconds.
 #undef delay
 
-#include "BConstants.h"
 #include "wiring.h"
 
 // Get the hardware port of the given virtual pin number.  This comes from
diff --git a/core/wiring.h b/core/wiring.h
index a78a54217..d63ec9cfb 100755
--- a/core/wiring.h
+++ b/core/wiring.h
@@ -67,6 +67,8 @@ void setup(void);
 void loop(void);
 void beginSerial(int);
 void serialWrite(unsigned char);
+void print(const char *, ...);
+void printMode(int);
 
 typedef struct {
 	int port;
diff --git a/core/wiringlite.inc b/core/wiringlite.inc
index fa9844647..5b16037eb 100755
--- a/core/wiringlite.inc
+++ b/core/wiringlite.inc
@@ -9,6 +9,8 @@
 
 #define __MCU_CLOCK_FREQUENCY__ _16.0000_MHz
 
+#include <avr/io.h>
+
 #include "wiring.h"
 
 #include <avr/interrupt.h>
diff --git a/todo.txt b/todo.txt
index 493245564..c6788bcfd 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1 +1 @@
-0001 arduino
+0002 arduino