diff --git a/Makefile b/Makefile
index 5e1a9d6220..05a185f643 100755
--- a/Makefile
+++ b/Makefile
@@ -65,6 +65,7 @@ default:
 	@echo "solaris-x86-64"
 	@echo "wince-arm"
 	@echo "winnt-x86-32"
+	@echo "winnt-x86-64"
 	@echo ""
 	@echo "Additional modifiers:"
 	@echo ""
@@ -125,6 +126,9 @@ solaris-x86-64:
 winnt-x86-32:
 	$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.32
 
+winnt-x86-64:
+	$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.64
+
 wince-arm:
 	$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.ce.arm
 
@@ -151,7 +155,7 @@ clean:
 	rm -f factor*.dll libfactor*.*
 
 vm/resources.o:
-	windres vm/factor.rs vm/resources.o
+	$(WINDRES) vm/factor.rs vm/resources.o
 
 .c.o:
 	$(CC) -c $(CFLAGS) -o $@ $<
diff --git a/extra/db/db.factor b/extra/db/db.factor
index b765924cd6..1c287cd871 100644
--- a/extra/db/db.factor
+++ b/extra/db/db.factor
@@ -10,7 +10,6 @@ C: <db> db ( handle -- obj )
 ! HOOK: db-create db ( str -- )
 ! HOOK: db-drop db ( str -- )
 GENERIC: db-open ( db -- )
-GENERIC: db-close ( db -- )
 
 TUPLE: statement sql params handle bound? ;
 
diff --git a/unmaintained/mysql/libmysql.factor b/extra/db/mysql/ffi/ffi.factor
similarity index 73%
rename from unmaintained/mysql/libmysql.factor
rename to extra/db/mysql/ffi/ffi.factor
index 064c7bffbc..845381a23c 100644
--- a/unmaintained/mysql/libmysql.factor
+++ b/extra/db/mysql/ffi/ffi.factor
@@ -1,27 +1,18 @@
-! See http://factorcode.org/license.txt
-! Copyright (C) 2007 Berlin Brown
-! Date: 1/17/2007
-!
-! libs/mysql/libmysql.factor
-!
+! Copyright (C) 2007 Berlin Brown, 2008 Doug Coleman.
+! See http://factorcode.org/license.txt for BSD license.
 ! Adapted from mysql.h and mysql.c
 ! Tested with MySQL version - 5.0.24a
+USING: alien alien.syntax combinators kernel system ;
+IN: db.mysql.ffi
 
-IN: mysql
-USING: alien kernel ;
-
-"mysql" {
+<< "mysql" {
     { [ win32? ] [ "libmySQL.dll" "stdcall" ] }
     { [ macosx? ] [ "libmysqlclient.14.dylib" "cdecl" ] }
     { [ unix? ] [ "libmysqlclient.so.14" "cdecl" ] }
-} cond add-library
+} cond add-library >>
 
 LIBRARY: mysql
 
-! ===============================================
-! mysql.c
-! ===============================================
-
 FUNCTION: void* mysql_init ( void* mysql ) ;
 FUNCTION: char* mysql_error ( void* mysql ) ;
 FUNCTION: void* mysql_real_connect ( void* mysql, char* host, char* user, char* passwd, char* db, int port, char* unixsocket, long clientflag ) ;
@@ -32,4 +23,3 @@ FUNCTION: void mysql_free_result ( void* result ) ;
 FUNCTION: char** mysql_fetch_row ( void* result ) ;
 FUNCTION: int mysql_num_fields ( void* result ) ;
 FUNCTION: ulong mysql_affected_rows ( void* mysql ) ;
-
diff --git a/extra/db/mysql/lib/lib.factor b/extra/db/mysql/lib/lib.factor
new file mode 100644
index 0000000000..59d1b6ff3d
--- /dev/null
+++ b/extra/db/mysql/lib/lib.factor
@@ -0,0 +1,78 @@
+! Copyright (C) 2007 Berlin Brown, 2008 Doug Coleman.
+! See http://factorcode.org/license.txt for license.
+! Adapted from mysql.h and mysql.c
+! Tested with MySQL version - 5.0.24a
+USING: kernel alien io prettyprint sequences
+namespaces arrays math db.mysql.ffi system ;
+IN: db.mysql.lib
+
+SYMBOL: my-conn
+
+TUPLE: mysql-db handle host user password db port ;
+TUPLE: mysql-statement ;
+TUPLE: mysql-result-set ;
+
+: new-mysql ( -- conn )
+    f mysql_init ;
+
+: mysql-error ( mysql -- )
+    [ mysql_error throw ] when* ;
+
+: mysql-connect ( mysql-connection -- )
+    new-mysql over set-mysql-db-handle
+    dup {
+        mysql-db-handle
+        mysql-db-host
+        mysql-db-user
+        mysql-db-password
+        mysql-db-db
+        mysql-db-port
+    } get-slots f 0 mysql_real_connect mysql-error ;
+
+! =========================================================
+! Low level mysql utility definitions
+! =========================================================
+
+: (mysql-query) ( mysql-connection query -- ret )
+    >r mysql-db-handle r> mysql_query ;
+
+! : (mysql-result) ( mysql-connection -- ret )
+    ! [ mysql-db-handle mysql_use_result ] keep 
+    ! [ set-mysql-connection-resulthandle ] keep ;
+
+! : (mysql-affected-rows) ( mysql-connection -- n )
+    ! mysql-connection-mysqlconn mysql_affected_rows ;
+
+! : (mysql-free-result) ( mysql-connection -- )
+    ! mysql-connection-resulthandle drop ;
+
+! : (mysql-row) ( mysql-connection -- row )
+    ! mysql-connection-resulthandle mysql_fetch_row ;
+
+! : (mysql-num-cols) ( mysql-connection -- n )
+    ! mysql-connection-resulthandle mysql_num_fields ;
+   
+! : mysql-char*-nth ( index object -- str )
+    ! #! Utility based on 'char*-nth' to perform an additional sanity check on the value
+    ! #! extracted from the array of strings.
+    ! void*-nth [ alien>char-string ] [ "" ] if* ;
+
+! : mysql-row>seq ( object n -- seq )
+    ! [ swap mysql-char*-nth ] map-with ;
+
+! : (mysql-result>seq) ( seq -- seq )
+    ! my-conn get (mysql-row) dup [       
+        ! my-conn get (mysql-num-cols) mysql-row>seq
+        ! over push
+        ! (mysql-result>seq)
+    ! ] [ drop ] if 
+    ! ! Perform needed cleanup on fetched results
+    ! my-conn get (mysql-free-result) ;
+
+! : mysql-query ( query -- ret )
+    ! >r my-conn get r> (mysql-query) drop
+    ! my-conn get (mysql-result) ;
+
+! : mysql-command ( query -- n )
+    ! mysql-query drop
+    ! my-conn get (mysql-affected-rows) ;
diff --git a/extra/db/mysql/mysql.factor b/extra/db/mysql/mysql.factor
new file mode 100644
index 0000000000..941c25e1fa
--- /dev/null
+++ b/extra/db/mysql/mysql.factor
@@ -0,0 +1,58 @@
+! Copyright (C) 2008 Doug Coleman.
+! See http://factorcode.org/license.txt for license.
+USING: alien continuations io kernel prettyprint sequences
+db db.mysql.ffi ;
+IN: db.mysql
+
+TUPLE: mysql-db handle host user password db port ;
+TUPLE: mysql-statement ;
+TUPLE: mysql-result-set ;
+
+M: mysql-db db-open ( mysql-db -- )
+    ;
+
+M: mysql-db dispose ( mysql-db -- )
+    mysql-db-handle mysql_close ;
+
+
+M: mysql-db <simple-statement> ( str -- statement )
+    ;
+
+M: mysql-db <prepared-statement> ( str -- statement )
+    ;
+
+M: mysql-statement prepare-statement ( statement -- )
+    ;
+
+M: mysql-statement bind-statement* ( statement -- )
+    ;
+
+M: mysql-statement rebind-statement ( statement -- )
+    ;
+
+M: mysql-statement execute-statement ( statement -- )
+    ;
+
+M: mysql-statement query-results ( query -- result-set )
+    ;
+
+M: mysql-result-set #rows ( result-set -- n )
+    ;
+
+M: mysql-result-set #columns ( result-set -- n )
+    ;
+
+M: mysql-result-set row-column ( result-set n -- obj )
+    ;
+
+M: mysql-result-set advance-row ( result-set -- ? )
+    ;
+
+M: mysql-db begin-transaction ( -- )
+    ;
+
+M: mysql-db commit-transaction ( -- )
+    ;
+
+M: mysql-db rollback-transaction ( -- )
+    ;
diff --git a/extra/db/postgresql/ffi/ffi.factor b/extra/db/postgresql/ffi/ffi.factor
index dbaa70c625..23368164a1 100644
--- a/extra/db/postgresql/ffi/ffi.factor
+++ b/extra/db/postgresql/ffi/ffi.factor
@@ -1,6 +1,5 @@
 ! Copyright (C) 2007 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-! adapted from libpq-fe.h version 7.4.7
 ! tested on debian linux with postgresql 8.1
 
 USING: alien alien.syntax combinators system ;
diff --git a/extra/db/sqlite/sqlite-tests.factor b/extra/db/sqlite/sqlite-tests.factor
index f64b8d1104..c6576dcd62 100644
--- a/extra/db/sqlite/sqlite-tests.factor
+++ b/extra/db/sqlite/sqlite-tests.factor
@@ -1,42 +1,28 @@
 USING: io io.files io.launcher kernel namespaces
-prettyprint tools.test db.sqlite db db.sql sequences
+prettyprint tools.test db.sqlite db sequences
 continuations ;
 IN: temporary
 
-! "sqlite3 -init test.txt test.db"
-
-IN: scratchpad
 : test.db "extra/db/sqlite/test.db" resource-path ;
 
-IN: temporary
-: (create-db) ( -- str )
-    [
-        "sqlite3 -init " %
-        test.db %
-        " " %
-        test.db %
-    ] "" make ;
+[ ] [ [ test.db delete-file ] catch drop ] unit-test
 
-: create-db ( -- ) (create-db) run-process drop ;
+[ ] [
+    test.db [
+        "create table person (name varchar(30), country varchar(30))" sql-command
+        "insert into person values('John', 'America')" sql-command
+        "insert into person values('Jane', 'New Zealand')" sql-command
+    ] with-sqlite
+] unit-test
 
-[ ] [ test.db delete-file ] unit-test
 
-[ ] [ create-db ] unit-test
-
-[
-    {
-        { "John" "America" }
-        { "Jane" "New Zealand" }
-    }
-] [
+[ { { "John" "America" } { "Jane" "New Zealand" } } ] [
     test.db [
         "select * from person" sql-query
     ] with-sqlite
 ] unit-test
 
-[
-    { { "John" "America" } }
-] [
+[ { { "John" "America" } } ] [
     test.db [
         "select * from person where name = :name and country = :country"
         <simple-statement> [
@@ -52,15 +38,10 @@ IN: temporary
     ] with-sqlite
 ] unit-test
 
-[
-    {
-        { "1" "John" "America" }
-        { "2" "Jane" "New Zealand" }
-    }
-] [ test.db [ "select rowid, * from person" sql-query ] with-sqlite ] unit-test
+[ { { "1" "John" "America" } { "2" "Jane" "New Zealand" } } ]
+[ test.db [ "select rowid, * from person" sql-query ] with-sqlite ] unit-test
 
-[
-] [
+[ ] [
     test.db [
         "insert into person(name, country) values('Jimmy', 'Canada')"
         sql-command
diff --git a/extra/db/sqlite/sqlite.factor b/extra/db/sqlite/sqlite.factor
index 49462dcc50..73b93d404b 100644
--- a/extra/db/sqlite/sqlite.factor
+++ b/extra/db/sqlite/sqlite.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2005, 2008 Chris Double, Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien arrays assocs classes compiler db db.sql
+USING: alien arrays assocs classes compiler db
 hashtables io.files kernel math math.parser namespaces
 prettyprint sequences strings tuples alien.c-types
 continuations db.sqlite.lib db.sqlite.ffi ;
diff --git a/extra/hardware-info/hardware-info.factor b/extra/hardware-info/hardware-info.factor
index 0515646a5f..69b8678749 100755
--- a/extra/hardware-info/hardware-info.factor
+++ b/extra/hardware-info/hardware-info.factor
@@ -1,12 +1,13 @@
-USING: alien.syntax kernel math prettyprint system
-combinators vocabs.loader hardware-info.backend ;
+USING: alien.syntax kernel math prettyprint
+combinators vocabs.loader hardware-info.backend system ;
 IN: hardware-info
 
 : kb. ( x -- ) 10 2^ /f . ;
 : megs. ( x -- ) 20 2^ /f . ;
 : gigs. ( x -- ) 30 2^ /f . ;
 
-<< {
+<<
+{
     { [ windows? ] [ "hardware-info.windows" ] }
     { [ linux? ] [ "hardware-info.linux" ] }
     { [ macosx? ] [ "hardware-info.macosx" ] }
diff --git a/extra/hardware-info/windows/backend/backend.factor b/extra/hardware-info/windows/backend/backend.factor
deleted file mode 100644
index 516603c441..0000000000
--- a/extra/hardware-info/windows/backend/backend.factor
+++ /dev/null
@@ -1,6 +0,0 @@
-IN: hardware-info.windows.backend
-
-TUPLE: wince ;
-TUPLE: winnt ;
-UNION: windows wince winnt ;
-
diff --git a/extra/hardware-info/windows/ce/ce.factor b/extra/hardware-info/windows/ce/ce.factor
index 1592bad14c..8923d86b03 100755
--- a/extra/hardware-info/windows/ce/ce.factor
+++ b/extra/hardware-info/windows/ce/ce.factor
@@ -2,8 +2,8 @@ USING: alien.c-types hardware-info kernel math namespaces
 windows windows.kernel32 hardware-info.backend ;
 IN: hardware-info.windows.ce
 
-TUPLE: wince ;
-T{ wince } os set-global
+TUPLE: wince-os ;
+T{ wince-os } os set-global
 
 : memory-status ( -- MEMORYSTATUS )
     "MEMORYSTATUS" <c-object>
diff --git a/extra/hardware-info/windows/nt/nt.factor b/extra/hardware-info/windows/nt/nt.factor
index 827b32c2f2..8bdb75fe6a 100755
--- a/extra/hardware-info/windows/nt/nt.factor
+++ b/extra/hardware-info/windows/nt/nt.factor
@@ -1,16 +1,15 @@
-USING: alien alien.c-types hardware-info.windows.backend
+USING: alien alien.c-types
 kernel libc math namespaces hardware-info.backend
 windows windows.advapi32 windows.kernel32 ;
 IN: hardware-info.windows.nt
 
-TUPLE: winnt ;
-
-T{ winnt } os set-global
+TUPLE: winnt-os ;
+T{ winnt-os } os set-global
 
 : system-info ( -- SYSTEM_INFO )
     "SYSTEM_INFO" <c-object> [ GetSystemInfo ] keep ;
 
-M: winnt cpus ( -- n )
+M: winnt-os cpus ( -- n )
     system-info SYSTEM_INFO-dwNumberOfProcessors ;
 
 : memory-status ( -- MEMORYSTATUSEX )
@@ -18,25 +17,25 @@ M: winnt cpus ( -- n )
     "MEMORYSTATUSEX" heap-size over set-MEMORYSTATUSEX-dwLength
     [ GlobalMemoryStatusEx ] keep swap zero? [ win32-error ] when ;
 
-M: winnt memory-load ( -- n )
+M: winnt-os memory-load ( -- n )
     memory-status MEMORYSTATUSEX-dwMemoryLoad ;
 
-M: winnt physical-mem ( -- n )
+M: winnt-os physical-mem ( -- n )
     memory-status MEMORYSTATUSEX-ullTotalPhys ;
 
-M: winnt available-mem ( -- n )
+M: winnt-os available-mem ( -- n )
     memory-status MEMORYSTATUSEX-ullAvailPhys ;
 
-M: winnt total-page-file ( -- n )
+M: winnt-os total-page-file ( -- n )
     memory-status MEMORYSTATUSEX-ullTotalPageFile ;
 
-M: winnt available-page-file ( -- n )
+M: winnt-os available-page-file ( -- n )
     memory-status MEMORYSTATUSEX-ullAvailPageFile ;
 
-M: winnt total-virtual-mem ( -- n )
+M: winnt-os total-virtual-mem ( -- n )
     memory-status MEMORYSTATUSEX-ullTotalVirtual ;
 
-M: winnt available-virtual-mem ( -- n )
+M: winnt-os available-virtual-mem ( -- n )
     memory-status MEMORYSTATUSEX-ullAvailVirtual ;
 
 : computer-name ( -- string )
@@ -54,4 +53,3 @@ M: winnt available-virtual-mem ( -- n )
     ] [
         [ alien>u16-string ] keep free
     ] if ;
-
diff --git a/extra/hardware-info/windows/windows.factor b/extra/hardware-info/windows/windows.factor
index 67d13fc50f..f3a1eb33f5 100755
--- a/extra/hardware-info/windows/windows.factor
+++ b/extra/hardware-info/windows/windows.factor
@@ -1,7 +1,7 @@
 USING: alien alien.c-types kernel libc math namespaces
 windows windows.kernel32 windows.advapi32
-hardware-info.windows.backend
-words combinators vocabs.loader hardware-info.backend ;
+words combinators vocabs.loader hardware-info.backend
+system ;
 IN: hardware-info.windows
 
 : system-info ( -- SYSTEM_INFO )
@@ -63,7 +63,8 @@ IN: hardware-info.windows
 : system-windows-directory ( -- str )
     \ GetSystemWindowsDirectory get-directory ;
 
+<<
 {
     { [ wince? ] [ "hardware-info.windows.ce" ] }
     { [ winnt? ] [ "hardware-info.windows.nt" ] }
-} cond [ require ] when*
+} cond [ require ] when* >>
diff --git a/extra/io/unix/files/files.factor b/extra/io/unix/files/files.factor
index a70f7339d2..3bf0e3f897 100755
--- a/extra/io/unix/files/files.factor
+++ b/extra/io/unix/files/files.factor
@@ -6,8 +6,8 @@ alien ;
 IN: io.unix.files
 
 M: unix-io cwd
-    MAXPATHLEN dup <byte-array> getcwd
-    [ alien>char-string ] [ (io-error) ] if* ;
+    MAXPATHLEN dup <byte-array> swap
+    getcwd [ (io-error) ] unless* ;
 
 M: unix-io cd
     chdir io-error ;
diff --git a/extra/ogg/theora/theora.factor b/extra/ogg/theora/theora.factor
index 0d9748a6f3..48b61b41a3 100644
--- a/extra/ogg/theora/theora.factor
+++ b/extra/ogg/theora/theora.factor
@@ -6,7 +6,7 @@ IN: ogg.theora
 
 <<
 "theora" {
-    { [ win32? ]  [ "libtheora.dll" ] }
+    { [ win32? ]  [ "theora.dll" ] }
     { [ macosx? ] [ "libtheora.0.dylib" ] }
     { [ unix? ]   [ "libtheora.so" ] }
 } cond "cdecl" add-library
diff --git a/extra/ogg/vorbis/vorbis.factor b/extra/ogg/vorbis/vorbis.factor
index 26e917ebf4..170d0ea6ef 100644
--- a/extra/ogg/vorbis/vorbis.factor
+++ b/extra/ogg/vorbis/vorbis.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
 !
-USING: kernel system combinators alien alien.syntax ;
+USING: kernel system combinators alien alien.syntax ogg ;
 IN: ogg.vorbis
 
 <<
diff --git a/extra/x/widgets/wm/frame/frame.factor b/extra/x/widgets/wm/frame/frame.factor
index 4e3b4e7c93..b75671fa3c 100755
--- a/extra/x/widgets/wm/frame/frame.factor
+++ b/extra/x/widgets/wm/frame/frame.factor
@@ -4,6 +4,7 @@ USING: kernel io combinators namespaces quotations arrays sequences
        x11.xlib x11.constants
        mortar mortar.sugar slot-accessors
        geom.rect
+       math.bitfields
        x x.gc x.widgets
        x.widgets.button
        x.widgets.wm.child
diff --git a/misc/factor.sh b/misc/factor.sh
index 032b0b3184..26ebd04531 100755
--- a/misc/factor.sh
+++ b/misc/factor.sh
@@ -45,7 +45,6 @@ check_gcc_version() {
 }
 
 check_installed_programs() {
-        ensure_program_installed sudo
         ensure_program_installed chmod
         ensure_program_installed uname
         ensure_program_installed git
@@ -100,9 +99,9 @@ find_os() {
         uname_s=`uname -s`
         check_ret uname
         case $uname_s in
-                CYGWIN_NT-5.2-WOW64) OS=windows-nt;;
-                *CYGWIN_NT*) OS=windows-nt;;
-                *CYGWIN*) OS=windows-nt;;
+                CYGWIN_NT-5.2-WOW64) OS=winnt;;
+                *CYGWIN_NT*) OS=winnt;;
+                *CYGWIN*) OS=winnt;;
                 *darwin*) OS=macosx;;
                 *Darwin*) OS=macosx;;
                 *linux*) OS=linux;;
@@ -140,7 +139,7 @@ find_word_size() {
 
 set_factor_binary() {
         case $OS in
-                windows-nt) FACTOR_BINARY=factor-nt;;
+                winnt) FACTOR_BINARY=factor-nt;;
                 macosx) FACTOR_BINARY=./Factor.app/Contents/MacOS/factor;;
                 *) FACTOR_BINARY=factor;;
         esac
@@ -197,7 +196,7 @@ git_clone() {
 
 git_pull_factorcode() {
         echo "Updating the git repository from factorcode.org..."
-        git pull git://factorcode.org/git/factor.git
+        git pull git://factorcode.org/git/factor.git master
         check_ret git
 }
 
@@ -220,6 +219,7 @@ delete_boot_images() {
         echo "Deleting old images..."
         rm $BOOT_IMAGE > /dev/null 2>&1
         rm $BOOT_IMAGE.* > /dev/null 2>&1
+		rm staging.*.image > /dev/null 2>&1
 }
 
 get_boot_image() {
@@ -228,11 +228,23 @@ get_boot_image() {
 }
 
 maybe_download_dlls() {
-        if [[ $OS == windows-nt ]] ; then
+        if [[ $OS == winnt ]] ; then
                 wget http://factorcode.org/dlls/freetype6.dll
                 check_ret wget
                 wget http://factorcode.org/dlls/zlib1.dll
                 check_ret wget
+                wget http://factorcode.org/dlls/OpenAL32.dll
+                check_ret wget
+                wget http://factorcode.org/dlls/alut.dll
+                check_ret wget
+                wget http://factorcode.org/dlls/ogg.dll
+                check_ret wget
+                wget http://factorcode.org/dlls/theora.dll
+                check_ret wget
+                wget http://factorcode.org/dlls/vorbis.dll
+                check_ret wget
+                wget http://factorcode.org/dlls/sqlite3.dll
+                check_ret wget
                 chmod 777 *.dll
                 check_ret chmod
         fi
diff --git a/unmaintained/mysql/load.factor b/unmaintained/mysql/load.factor
deleted file mode 100644
index b3872d6259..0000000000
--- a/unmaintained/mysql/load.factor
+++ /dev/null
@@ -1,11 +0,0 @@
-! License: See http://factor.sf.net/license.txt for BSD license.
-! Berlin Brown
-! Date: 1/17/2007
-!
-! Adapted from mysql.h and mysql.c
-! Tested with MySQL version - 5.0.24a
-PROVIDE: libs/mysql
-{ +files+ {
-    "libmysql.factor"
-    "mysql.factor"
-} } ;
\ No newline at end of file
diff --git a/unmaintained/mysql/mysql.factor b/unmaintained/mysql/mysql.factor
deleted file mode 100644
index 22a6bc9248..0000000000
--- a/unmaintained/mysql/mysql.factor
+++ /dev/null
@@ -1,124 +0,0 @@
-! See http://factorcode.org/license.txt for license.
-! Copyright (C) 2007 Berlin Brown
-! Date: 1/17/2007
-!
-! libs/mysql/mysql.factor
-!
-! Adapted from mysql.h and mysql.c
-! Tested with MySQL version - 5.0.24a
-
-IN: mysql
-USING: kernel alien errors io prettyprint 
-    sequences namespaces arrays math tools generic ;
-
-SYMBOL: my-conn
-
-TUPLE: mysql-connection mysqlconn host user password db port handle resulthandle ;
-
-: init-mysql ( -- conn )
-    f mysql_init ;
-    
-C: mysql-connection ( host user password db port -- mysql-connection )
-    [ set-mysql-connection-port ] keep
-    [ set-mysql-connection-db ] keep
-    [ set-mysql-connection-password ] keep
-    [ set-mysql-connection-user ] keep
-    [ set-mysql-connection-host ] keep ;
-
-: (mysql-error) ( mysql-connection -- str )
-    mysql-connection-mysqlconn mysql_error ;
-
-: connect-error-msg ( mysql-connection -- s ) 
-    mysql-connection-mysqlconn mysql_error
-    [
-        "Couldn't connect to mysql database.\n" %
-        "Message: " % %
-    ] "" make ;
-
-: mysql-connect ( mysql-connection -- )
-    init-mysql swap
-    [ set-mysql-connection-mysqlconn ] 2keep
-    [ mysql-connection-host ] keep
-    [ mysql-connection-user ] keep
-    [ mysql-connection-password ] keep
-    [ mysql-connection-db ] keep
-    [ mysql-connection-port f 0 mysql_real_connect ] keep
-    [ set-mysql-connection-handle ] keep 
-    dup mysql-connection-handle 
-    [ connect-error-msg throw ] unless ;
-
-! =========================================================
-! Low level mysql utility definitions
-! =========================================================
-
-: (mysql-query) ( mysql-connection query -- ret )
-    >r mysql-connection-mysqlconn r> mysql_query ;
-
-: (mysql-result) ( mysql-connection -- ret )
-    [ mysql-connection-mysqlconn mysql_use_result ] keep 
-    [ set-mysql-connection-resulthandle ] keep ;
-    
-: (mysql-affected-rows) ( mysql-connection -- n )
-    mysql-connection-mysqlconn mysql_affected_rows ;
-
-: (mysql-free-result) ( mysql-connection -- )
-    mysql-connection-resulthandle drop ;
-
-: (mysql-row) ( mysql-connection -- row )
-    mysql-connection-resulthandle mysql_fetch_row ;
-
-: (mysql-num-cols) ( mysql-connection -- n )
-    mysql-connection-resulthandle mysql_num_fields ;
-   
-: mysql-char*-nth ( index object -- str )
-    #! Utility based on 'char*-nth' to perform an additional sanity check on the value
-    #! extracted from the array of strings.
-    void*-nth [ alien>char-string ] [ "" ] if* ;
-        
-: mysql-row>seq ( object n -- seq )
-    [ swap mysql-char*-nth ] map-with ;
-    
-: (mysql-result>seq) ( seq -- seq )
-    my-conn get (mysql-row) dup [       
-        my-conn get (mysql-num-cols) mysql-row>seq
-        over push
-        (mysql-result>seq)
-    ] [ drop ] if 
-    ! Perform needed cleanup on fetched results
-    my-conn get (mysql-free-result) ;
-            
-! =========================================================
-!  Public Word Definitions
-! =========================================================
-
-: mysql-close ( mysql-connection -- )
-    mysql-connection-mysqlconn mysql_close ;
-
-: mysql-print-table ( seq -- )
-    [ [ write bl ] each "\n" write ] each ;
-    
-: mysql-query ( query -- ret )
-    >r my-conn get r> (mysql-query) drop
-    my-conn get (mysql-result) ;
-
-: mysql-command ( query -- n )
-    mysql-query drop
-    my-conn get (mysql-affected-rows) ;
-
-: mysql-error ( -- s )
-    #! Get the last mysql error
-    my-conn get (mysql-error) ; 
-
-: mysql-result>seq ( -- seq )
-    V{ } clone (mysql-result>seq) ;
-        
-: with-mysql ( host user password db port quot -- )
-    [ 
-        >r <mysql-connection> my-conn set 
-            my-conn get mysql-connect drop r> 
-        [ my-conn get mysql-close ] cleanup
-    ] with-scope ; inline
-    
-: with-mysql-catch ( host user password db port quot -- )
-    [ with-mysql ] catch [ "Caught: " write print ] when* ;
-    
\ No newline at end of file
diff --git a/unmaintained/mysql/test/create_database.sql b/unmaintained/mysql/test/create_database.sql
deleted file mode 100644
index 00fd323046..0000000000
--- a/unmaintained/mysql/test/create_database.sql
+++ /dev/null
@@ -1,17 +0,0 @@
---
--- Create three databases (development / test / production) 
--- with prefix 'factordb_'
-create database factordb_development;
-create database factordb_test;
-create database factordb_production;
-
-grant all on factordb_development.* to 'factoruser'@'localhost' identified by 'mysqlfactor';
-grant all on factordb_test.* to 'factoruser'@'localhost' identified by 'mysqlfactor';
-grant all on factordb_production.* to 'factoruser'@'localhost' identified by 'mysqlfactor';
-
-grant all on factordb_development.* to 'factoruser'@'*' identified by 'mysqlfactor';
-grant all on factordb_test.* to 'factoruser'@'*' identified by 'mysqlfactor';
-grant all on factordb_production.* to 'factoruser'@'*' identified by 'mysqlfactor';
-
--- End of the Script
-
diff --git a/unmaintained/mysql/test/mysql-example.factor b/unmaintained/mysql/test/mysql-example.factor
deleted file mode 100644
index 2476153c8a..0000000000
--- a/unmaintained/mysql/test/mysql-example.factor
+++ /dev/null
@@ -1,57 +0,0 @@
-! See http://factorcode.org/license.txt for license.
-! Simple test for mysql library
-! libs/mysql/test/mysql-example.factor
-
-IN: mysql-example
-REQUIRES: libs/mysql ;
-USING: sequences mysql modules prettyprint kernel io math tools namespaces test ;
-
-"Testing..." print nl
-
-: get-drop-table ( -- s )
-       "DROP TABLE if exists DISCUSSION_FORUM" ;
-
-: get-insert-table ( -- s )
-    {
-        "INSERT INTO DISCUSSION_FORUM(category, full_name, email, title, main_url, keywords, message) "
-        "VALUES('none', 'John Doe', 'johndoe@test.com', 'The Message', NULL, NULL, 'Testing')"
-    } "" join ;
-
-: get-update-table ( -- s )
-    "UPDATE DISCUSSION_FORUM set category = 'my-new-category'" ;
-    
-: get-delete-table ( -- s )
-    "DELETE FROM DISCUSSION_FORUM where id = 2" ;
-
-: get-create-table ( -- s )
-    {
-        "create table DISCUSSION_FORUM("
-        "id                     int(11) NOT NULL auto_increment,"
-        "category               varchar(128),"
-        "full_name              varchar(128) NOT NULL,"
-        "email                  varchar(128) NOT NULL,"
-        "title                  varchar(255) NOT NULL,"
-        "main_url               varchar(255),"
-        "keywords               varchar(255),"
-        "message                text NOT NULL,"
-        "created_on             DATETIME NOT NULL DEFAULT '0000-00-0000:00:00',"
-        "PRIMARY KEY (id));"
-    } "" join ;
-
-[ "localhost" "factoruser" "mysqlfactor" "factordb_development" 0 [
-    get-drop-table mysql-command drop
-    get-create-table mysql-command drop
-    get-update-table mysql-command drop
-    get-delete-table mysql-command drop
-    
-    ! Insert multiple records
-    20 [
-        get-insert-table mysql-command 2drop
-    ] each
-        
-    "select * from discussion_forum order by created_on" mysql-query drop
-    mysql-result>seq mysql-print-table
-
-] with-mysql ] time
-
-"Done" print
\ No newline at end of file
diff --git a/vm/Config.windows.nt.x86.32 b/vm/Config.windows.nt.x86.32
index 9a020a7bc1..603a7200ae 100644
--- a/vm/Config.windows.nt.x86.32
+++ b/vm/Config.windows.nt.x86.32
@@ -1,3 +1,4 @@
 WINDRES=windres
 include vm/Config.windows.nt
 include vm/Config.x86.32
+#error "lolllll"
diff --git a/vm/Config.windows.nt.x86.64 b/vm/Config.windows.nt.x86.64
index 1c30e64096..6d3865c2f4 100644
--- a/vm/Config.windows.nt.x86.64
+++ b/vm/Config.windows.nt.x86.64
@@ -1,4 +1,6 @@
-CC=/k/target/bin/x86_64-pc-mingw32-gcc
+#WIN64_PATH=/k/MinGW/win64/bin
+WIN64_PATH=/cygdrive/k/MinGW/win64/bin/x86_64-pc-mingw32
+CC=$(WIN64_PATH)-gcc.exe
+WINDRES=$(WIN64_PATH)-windres.exe
 include vm/Config.windows.nt
 include vm/Config.x86.64
-WINDRES = /k/target/bin/windres
diff --git a/vm/os-windows-nt.32.h b/vm/os-windows-nt.32.h
new file mode 100644
index 0000000000..9b10671ba0
--- /dev/null
+++ b/vm/os-windows-nt.32.h
@@ -0,0 +1,2 @@
+#define ESP Esp
+#define EIP Eip
diff --git a/vm/os-windows-nt.64.h b/vm/os-windows-nt.64.h
new file mode 100644
index 0000000000..1f61c2335f
--- /dev/null
+++ b/vm/os-windows-nt.64.h
@@ -0,0 +1,2 @@
+#define ESP Rsp
+#define EIP Rip
diff --git a/vm/os-windows-nt.c b/vm/os-windows-nt.c
index 99ac21f62f..cc7b128941 100755
--- a/vm/os-windows-nt.c
+++ b/vm/os-windows-nt.c
@@ -42,26 +42,26 @@ long exception_handler(PEXCEPTION_POINTERS pe)
 	PEXCEPTION_RECORD e = (PEXCEPTION_RECORD)pe->ExceptionRecord;
 	CONTEXT *c = (CONTEXT*)pe->ContextRecord;
 
-	if(in_code_heap_p(c->Eip))
-		signal_callstack_top = (void *)c->Esp;
+	if(in_code_heap_p(c->EIP))
+		signal_callstack_top = (void *)c->ESP;
 	else
 		signal_callstack_top = NULL;
 
 	if(e->ExceptionCode == EXCEPTION_ACCESS_VIOLATION)
 	{
 		signal_fault_addr = e->ExceptionInformation[1];
-		c->Eip = (CELL)memory_signal_handler_impl;
+		c->EIP = (CELL)memory_signal_handler_impl;
 	}
 	else if(e->ExceptionCode == EXCEPTION_FLT_DIVIDE_BY_ZERO
 			|| e->ExceptionCode == EXCEPTION_INT_DIVIDE_BY_ZERO)
 	{
 		signal_number = ERROR_DIVIDE_BY_ZERO;
-		c->Eip = (CELL)divide_by_zero_signal_handler_impl;
+		c->EIP = (CELL)divide_by_zero_signal_handler_impl;
 	}
 	else
 	{
 		signal_number = 11;
-		c->Eip = (CELL)misc_signal_handler_impl;
+		c->EIP = (CELL)misc_signal_handler_impl;
 	}
 
 	return EXCEPTION_CONTINUE_EXECUTION;
diff --git a/vm/platform.h b/vm/platform.h
index b0641176bc..66f22bbf96 100644
--- a/vm/platform.h
+++ b/vm/platform.h
@@ -1,11 +1,11 @@
 #if defined(__arm__)
 	#define FACTOR_ARM
+#elif defined(__amd64__) || defined(__x86_64__)
+	#define FACTOR_AMD64
 #elif defined(i386) || defined(__i386) || defined(__i386__) || defined(WIN32)
 	#define FACTOR_X86
 #elif defined(__POWERPC__) || defined(__ppc__) || defined(_ARCH_PPC)
 	#define FACTOR_PPC
-#elif defined(__amd64__) || defined(__x86_64__)
-	#define FACTOR_AMD64
 #else
 	#error "Unsupported architecture"
 #endif
@@ -18,6 +18,11 @@
 	#endif
 
 	#include "os-windows.h"
+	#if defined(FACTOR_AMD64)
+		#include "os-windows-nt.64.h"
+	#elif defined(FACTOR_X86)
+		#include "os-windows-nt.32.h"
+	#endif
 #else
 	#include "os-unix.h"