diff --git a/config b/config
index 8be093d..8e1bf33 100644
--- a/config
+++ b/config
@@ -1,7 +1,7 @@
 #Config file for ZEngine#
   #Edit only this file#
 
-BUILD= ZEngine-0.8.3
+BUILD= ZEngine-0.8.4
 
 #Define compiler commands:
 CC= g++
diff --git a/makefile b/makefile
index c7a461e..f9c736b 100644
--- a/makefile
+++ b/makefile
@@ -3,13 +3,26 @@
 ZE = .
 include $(ZE)/config
 
-LIB_OUT=$(ZE)/lib/libZEngineS.a
+LIB_OUT = $(ZE)/lib/libZEngineS.a
 
-libZEngineS.a: $(SRC)/ZE_Utility.cpp $(SRC)/ZE_ZTimer.cpp $(SRC)/ZE_ZImage.cpp $(SRC)/ZE_ZFont.cpp $(SRC)/ZE_ZMusic.cpp $(SRC)/ZE_ZConfigFile.cpp $(SRC)/ZE_ZSound.cpp $(SRC)/ZE_ZMusic.cpp $(SRC)/ZE_ZRect.cpp  $(SRC)/ZE_ZError.cpp $(SRC)/ZE_ZEngine.cpp $(SRC)/external/SDLGL_Util.cpp $(SRC)/external/mt19937ar.cpp
-	$(CC) $(CFLAGS) -c $(SRC)/ZE_Utility.cpp $(SRC)/ZE_ZTimer.cpp $(SRC)/ZE_ZImage.cpp $(SRC)/ZE_ZFont.cpp $(SRC)/ZE_ZMusic.cpp $(SRC)/ZE_ZConfigFile.cpp $(SRC)/ZE_ZSound.cpp $(SRC)/ZE_ZMusic.cpp $(SRC)/ZE_ZRect.cpp $(SRC)/ZE_ZError.cpp $(SRC)/ZE_ZEngine.cpp $(SRC)/external/SDLGL_Util.cpp $(SRC)/external/mt19937ar.cpp
-	$(AR) $(LIB_OUT) ZE_Utility.o ZE_ZTimer.o ZE_ZImage.o ZE_ZFont.o ZE_ZMusic.o ZE_ZConfigFile.o ZE_ZSound.o ZE_ZMusic.o ZE_ZError.o ZE_ZRect.o ZE_ZEngine.o SDLGL_Util.o mt19937ar.o
+LIB_SOURCES = $(SRC)/external/SDLGL_Util.cpp $(SRC)/VersionInfo.cpp $(SRC)/ZE_Utility.cpp \
+	$(SRC)/ZE_ZClient.cpp $(SRC)/ZE_ZConfigFile.cpp $(SRC)/ZE_ZEngine.cpp  \
+	$(SRC)/ZE_ZError.cpp $(SRC)/ZE_ZFont.cpp $(SRC)/ZE_ZImage.cpp $(SRC)/ZE_ZMusic.cpp \
+	$(SRC)/ZE_ZRandGen.cpp $(SRC)/ZE_ZRect.cpp $(SRC)/ZE_ZServer.cpp $(SRC)/ZE_ZSound.cpp \
+	$(SRC)/ZE_ZTimer.cpp $(SRC)/external/physfsrwops.cpp
+	
+LIB_OBJECTS = SDLGL_Util.o VersionInfo.o ZE_Utility.o ZE_ZClient.o ZE_ZConfigFile.o \
+	ZE_ZEngine.o ZE_ZError.o ZE_ZFont.o ZE_ZImage.o ZE_ZMusic.o ZE_ZRandGen.o ZE_ZRect.o \
+	ZE_ZServer.o ZE_ZSound.o ZE_ZTimer.o physfsrwops.o
 
-tests: $(TEST)/ZFontTest.cpp $(TEST)/ZMouseTest.cpp $(TEST)/ZMusicTest.cpp $(TEST)/ZSoundTest.cpp $(TEST)/ZTimerTest.cpp $(TEST)/ZImageTest.cpp $(TEST)/ZRectTest.cpp
+#build targets#
+
+libZEngineS.a: $(SOURCES)
+	$(CC) $(CFLAGS) -c $(LIB_SOURCES)
+	$(AR) $(LIB_OUT) $(LIB_OBJECTS)
+
+tests: $(TEST)/ZFontTest.cpp $(TEST)/ZMouseTest.cpp $(TEST)/ZMusicTest.cpp $(TEST)/ZSoundTest.cpp \
+	   $(TEST)/ZTimerTest.cpp $(TEST)/ZImageTest.cpp $(TEST)/ZRectTest.cpp $(TEST)/ZParticleTest.cpp
 	$(CC) $(CFLAGS) -L$(ZE)/lib $(TEST)/ZFontTest.cpp -o $(TEST)/bin/ZFontTest  $(LIBS)
 	$(CC) $(CFLAGS) -L$(ZE)/lib $(TEST)/ZMouseTest.cpp -o $(TEST)/bin/ZMouseTest $(LIBS)
 	$(CC) $(CFLAGS) -L$(ZE)/lib $(TEST)/ZMusicTest.cpp -o $(TEST)/bin/ZMusicTest $(LIBS)
@@ -17,6 +30,7 @@ tests: $(TEST)/ZFontTest.cpp $(TEST)/ZMouseTest.cpp $(TEST)/ZMusicTest.cpp $(TES
 	$(CC) $(CFLAGS) -L$(ZE)/lib $(TEST)/ZTimerTest.cpp -o $(TEST)/bin/ZTimerTest $(LIBS)
 	$(CC) $(CFLAGS) -L$(ZE)/lib $(TEST)/ZImageTest.cpp -o $(TEST)/bin/ZImageTest $(LIBS) 
 	$(CC) $(CFLAGS) -L$(ZE)/lib $(TEST)/ZRectTest.cpp -o $(TEST)/bin/ZRectTest $(LIBS)
+	$(CC) $(CFLAGS) -L$(ZE)/lib $(TEST)/ZParticleTest.cpp -o $(TEST)/bin/ZParticleTest $(LIBS)
 
 install: $(LIB_OUT)
 	mkdir -p $(INSTALL_ROOT)
@@ -28,10 +42,12 @@ install: $(LIB_OUT)
 	cp -r $(ZE)/doc/html/* $(INSTALL_DOC)
 	
 
-.PHONY: clean
+.PHONY: clean veryclean
 
 clean:
 	rm -f *.o
 
-
-
+veryclean:
+	rm -f *.o
+	rm -f $(TEST)/bin/*.exe
+	rm -f $(LIB_OUT)
\ No newline at end of file