diff --git a/.gitignore b/.gitignore
index aa9f1259..9d2f1973 100755
--- a/.gitignore
+++ b/.gitignore
@@ -23,4 +23,4 @@ contentpacks/
 resources/
 save.dat
 ai-crash.txt
-gentokenlr.py
\ No newline at end of file
+gentokenlr.py
diff --git a/all.bat b/all.bat
deleted file mode 100755
index 92036487..00000000
--- a/all.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-rem only use this with a non-remotedb
-start astron
-start ai
-start ud
-start client
diff --git a/astron/databases/.gitignore b/astron/databases/.gitignore
index 3997bead..98e6ef67 100755
--- a/astron/databases/.gitignore
+++ b/astron/databases/.gitignore
@@ -1 +1 @@
-*.db
\ No newline at end of file
+*.db
diff --git a/ai.bat b/astron/win32/start-ai-server.bat
old mode 100755
new mode 100644
similarity index 99%
rename from ai.bat
rename to astron/win32/start-ai-server.bat
index 62f74b66..0668b550
--- a/ai.bat
+++ b/astron/win32/start-ai-server.bat
@@ -1,4 +1,5 @@
 @echo off
+cd ../..
 
 rem Read the contents of PPYTHON_PATH into %PPYTHON_PATH%:
 set /P PPYTHON_PATH=<PPYTHON_PATH
diff --git a/astron/win32/start-all.bat b/astron/win32/start-all.bat
new file mode 100644
index 00000000..5f9f6b87
--- /dev/null
+++ b/astron/win32/start-all.bat
@@ -0,0 +1,5 @@
+rem Starts a Localhost server. This is meant for Windows. To connect to developer server, use the start-game-remotedb file for your OS.
+
+start start-astron-cluster
+start start-uberdog-server
+start start-ai-server
diff --git a/astron.bat b/astron/win32/start-astron-cluster.bat
old mode 100755
new mode 100644
similarity index 77%
rename from astron.bat
rename to astron/win32/start-astron-cluster.bat
index 041ef3bc..1827a47a
--- a/astron.bat
+++ b/astron/win32/start-astron-cluster.bat
@@ -1,4 +1,5 @@
 @echo off
-cd astron
+cd..
+
 astrond --loglevel info config/cluster.yml
-pause
\ No newline at end of file
+pause
diff --git a/ud.bat b/astron/win32/start-uberdog-server.bat
old mode 100755
new mode 100644
similarity index 99%
rename from ud.bat
rename to astron/win32/start-uberdog-server.bat
index 85e91547..8b39fc7d
--- a/ud.bat
+++ b/astron/win32/start-uberdog-server.bat
@@ -1,4 +1,5 @@
 @echo off
+cd ../..
 
 rem Read the contents of PPYTHON_PATH into %PPYTHON_PATH%:
 set /P PPYTHON_PATH=<PPYTHON_PATH
diff --git a/tools/.gitignore b/tools/.gitignore
index 266d0b73..bf0e88ae 100755
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1,2 +1,2 @@
 build
-build/*
\ No newline at end of file
+build/*
diff --git a/toontown/dna/DNAParser.py b/toontown/dna/DNAParser.py
index 76e49481..ef366db9 100755
--- a/toontown/dna/DNAParser.py
+++ b/toontown/dna/DNAParser.py
@@ -36,10 +36,8 @@ def loadDNAFileAI(dnaStorage, file):
 def setupDoor(a, b, c, d, e, f):
     try:
         e = int(str(e).split('_')[0])
-        
     except:
         print 'setupDoor: error parsing', e
         e = 9999
-        
-    DNADoor.setupDoor(a, b, c, d, e, f)
 
+    DNADoor.setupDoor(a, b, c, d, e, f)
diff --git a/toontown/toon/DistributedNPCLaffRestockAI.py b/toontown/toon/DistributedNPCLaffRestockAI.py
index 4570ec6a..5f267a36 100755
--- a/toontown/toon/DistributedNPCLaffRestockAI.py
+++ b/toontown/toon/DistributedNPCLaffRestockAI.py
@@ -89,11 +89,11 @@ class DistributedNPCLaffRestockAI(DistributedNPCToonBaseAI):
             return
         av = simbase.air.doId2do.get(avId)
         if av:
-			if av.getMaxHp() < (av.getHp() + laff):
-				movieType = NPCToons.SELL_MOVIE_CHEATER
-				self.air.writeServerEvent('suspicious', avId, 'DistributedNPCLaffRestockAI.restock invalid restock')
-				self.notify.warning('somebody tried to buy an invalid hp restock! avId: %s' % avId)
-			else:
-				movieType = NPCToons.SELL_MOVIE_COMPLETE
-				av.takeMoney(cost)
-				av.b_setHp(av.getHp() + laff)
+            if av.getMaxHp() < (av.getHp() + laff):
+                movieType = NPCToons.SELL_MOVIE_CHEATER
+                self.air.writeServerEvent('suspicious', avId, 'DistributedNPCLaffRestockAI.restock invalid restock')
+                self.notify.warning('somebody tried to buy an invalid hp restock! avId: %s' % avId)
+            else:
+                movieType = NPCToons.SELL_MOVIE_COMPLETE
+                av.takeMoney(cost)
+                av.b_setHp(av.getHp() + laff)
diff --git a/client.bat b/win32/start_game.bat
old mode 100755
new mode 100644
similarity index 72%
rename from client.bat
rename to win32/start_game.bat
index 34b1f2b1..028bdbb7
--- a/client.bat
+++ b/win32/start_game.bat
@@ -1,19 +1,23 @@
 @echo off
+cd..
+
 title TTS Game Launcher
+
+rem Read the contents of PPYTHON_PATH into %PPYTHON_PATH%:
 set /P PPYTHON_PATH=<PPYTHON_PATH
 
 echo Choose your game server!
 echo #1 - Localhost
-echo #2 - Loudrob
-echo #3 - Steve
-echo #4 - Custom
+echo #2 - Custom
+echo #3 - Loudrob
 echo.
 set /P INPUT=
+set server=unset
 
 if %INPUT%==1 set TTS_GAMESERVER=127.0.0.1
-if %INPUT%==2 set TTS_GAMESERVER=71.200.196.180
-if %INPUT%==3 set TTS_GAMESERVER=167.114.220.172
-if %INPUT%==4 (
+if %INPUT%==3 set TTS_GAMESERVER=71.200.196.180
+
+if %TTS_GAMESERVER%==unset (
     echo.
     set /P TTS_GAMESERVER=Gameserver: 
 )
@@ -29,4 +33,4 @@ echo Gameserver: %TTS_GAMESERVER%
 echo ===============================
 
 %PPYTHON_PATH% -m toontown.toonbase.ClientStart
-pause
\ No newline at end of file
+pause
diff --git a/start_game_remotedb.bat b/win32/start_game_remotedb.bat
old mode 100755
new mode 100644
similarity index 79%
rename from start_game_remotedb.bat
rename to win32/start_game_remotedb.bat
index 1b0ae898..96948c45
--- a/start_game_remotedb.bat
+++ b/win32/start_game_remotedb.bat
@@ -1,21 +1,22 @@
-@echo off
-
-title TTS Remote DB Launcher
-rem Read the contents of PPYTHON_PATH into %PPYTHON_PATH%:
-set /P PPYTHON_PATH=<PPYTHON_PATH
-
-rem Get the user input:
-set /P ttsUsername="Username: "
-set /P ttsPassword="Password: "
-echo Using Steve's dev server.
-set TTS_GAMESERVER=167.114.220.172
-
-echo ===============================
-echo Starting Toontown Stride...
-echo ppython: %PPYTHON_PATH%
-echo Username: %ttsUsername%
-echo Gameserver: %TTS_GAMESERVER%
-echo ===============================
-
-%PPYTHON_PATH% -m toontown.toonbase.ClientStartRemoteDB
-pause
+@echo off
+cd..
+
+title Toontown Stride RemoteDB Launcher
+
+rem Read the contents of PPYTHON_PATH into %PPYTHON_PATH%:
+set /P PPYTHON_PATH=<PPYTHON_PATH
+
+rem Get the user input:
+set /P ttsUsername="Username: "
+set /P ttsPassword="Password: "
+set TTS_GAMESERVER=167.114.220.172
+
+echo ===============================
+echo Starting Toontown Stride...
+echo ppython: %PPYTHON_PATH%
+echo Username: %ttsUsername%
+echo Gameserver: %TTS_GAMESERVER% (Steve's Dev Server)
+echo ===============================
+
+%PPYTHON_PATH% -m toontown.toonbase.ClientStartRemoteDB
+pause
diff --git a/guieditor.bat b/win32/start_gui_editor.bat
old mode 100755
new mode 100644
similarity index 58%
rename from guieditor.bat
rename to win32/start_gui_editor.bat
index 9dd74fb6..fe8a40c5
--- a/guieditor.bat
+++ b/win32/start_gui_editor.bat
@@ -1,7 +1,10 @@
 @echo off
+cd..
+
 title GUI Editor
+
+rem Read the contents of PPYTHON_PATH into %PPYTHON_PATH%:
 set /P PPYTHON_PATH=<PPYTHON_PATH
 
-:main
 %PPYTHON_PATH% -m guieditor.EditorStart
-goto main
\ No newline at end of file
+pause