diff --git a/Unuk-QT/Makefile b/Unuk-QT/Makefile
index fca81ca..35e7d3b 100644
--- a/Unuk-QT/Makefile
+++ b/Unuk-QT/Makefile
@@ -1,29 +1,25 @@
 #############################################################################
 # Makefile for building: Unuk-QT
-<<<<<<< HEAD
-# Generated by qmake (2.01a) (Qt 4.7.4) on: Wed Feb 1 19:11:29 2012
-=======
-# Generated by qmake (2.01a) (Qt 4.7.4) on: Wed Feb 1 21:18:56 2012
->>>>>>> 7a6a20dc0c0e4be1afba7b092f663f8be21feb53
+# Generated by qmake (2.01a) (Qt 4.7.4) on: Wed Feb 1 19:42:10 2012
 # Project:  Unuk-QT.pro
 # Template: app
-# Command: /home/kono/QtSDK/Desktop/Qt/474/gcc/bin/qmake -spec ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
+# Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
 #############################################################################
 
 ####### Compiler, tools and options
 
 CC            = gcc
 CXX           = g++
-DEFINES       = -DQT_GUI_LIB -DQT_CORE_LIB
+DEFINES       = -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
 CFLAGS        = -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
 CXXFLAGS      = -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH       = -I../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/linux-g++ -I. -I../../../QtSDK/Desktop/Qt/474/gcc/include/QtCore -I../../../QtSDK/Desktop/Qt/474/gcc/include/QtGui -I../../../QtSDK/Desktop/Qt/474/gcc/include -I.
+INCPATH       = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I.
 LINK          = g++
-LFLAGS        = -Wl,-rpath,/home/kono/QtSDK/Desktop/Qt/474/gcc/lib
-LIBS          = $(SUBLIBS)  -L/home/kono/QtSDK/Desktop/Qt/474/gcc/lib -lGL -lSDL -lSDL_ttf -lSDL_image -lSDL_gfx -ltinyxml -lGLU -lQtGui -lQtCore -lpthread 
+LFLAGS        = 
+LIBS          = $(SUBLIBS)  -L/usr/lib -lGL -lSDL -lSDL_ttf -lSDL_image -lSDL_gfx -ltinyxml -lGLU -lQtGui -lQtCore -lpthread 
 AR            = ar cqs
 RANLIB        = 
-QMAKE         = /home/kono/QtSDK/Desktop/Qt/474/gcc/bin/qmake
+QMAKE         = /usr/bin/qmake-qt4
 TAR           = tar -cf
 COMPRESS      = gzip -9f
 COPY          = cp -f
@@ -113,26 +109,25 @@ OBJECTS       = WorldManager.o \
 		EventHistory.o \
 		Bar.o \
 		Vec2.o
-DIST          = ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/g++.conf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/unix.conf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/linux.conf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/qconfig.pri \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/modules/qt_webkit_version.pri \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_functions.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_config.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/exclusive_builds.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_pre.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/debug.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_post.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/warn_on.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/unix/thread.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/moc.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/resources.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/uic.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/yacc.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/lex.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/include_source_dir.prf \
+DIST          = /usr/share/qt4/mkspecs/common/g++.conf \
+		/usr/share/qt4/mkspecs/common/unix.conf \
+		/usr/share/qt4/mkspecs/common/linux.conf \
+		/usr/share/qt4/mkspecs/qconfig.pri \
+		/usr/share/qt4/mkspecs/features/qt_functions.prf \
+		/usr/share/qt4/mkspecs/features/qt_config.prf \
+		/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+		/usr/share/qt4/mkspecs/features/default_pre.prf \
+		/usr/share/qt4/mkspecs/features/debug.prf \
+		/usr/share/qt4/mkspecs/features/default_post.prf \
+		/usr/share/qt4/mkspecs/features/warn_on.prf \
+		/usr/share/qt4/mkspecs/features/qt.prf \
+		/usr/share/qt4/mkspecs/features/unix/thread.prf \
+		/usr/share/qt4/mkspecs/features/moc.prf \
+		/usr/share/qt4/mkspecs/features/resources.prf \
+		/usr/share/qt4/mkspecs/features/uic.prf \
+		/usr/share/qt4/mkspecs/features/yacc.prf \
+		/usr/share/qt4/mkspecs/features/lex.prf \
+		/usr/share/qt4/mkspecs/features/include_source_dir.prf \
 		Unuk-QT.pro
 QMAKE_TARGET  = Unuk-QT
 DESTDIR       = 
@@ -165,49 +160,51 @@ all: Makefile $(TARGET)
 $(TARGET):  $(OBJECTS)  
 	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
 
-Makefile: Unuk-QT.pro  ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/linux-g++/qmake.conf ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/g++.conf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/unix.conf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/linux.conf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/qconfig.pri \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/modules/qt_webkit_version.pri \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_functions.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_config.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/exclusive_builds.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_pre.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/debug.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_post.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/warn_on.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/unix/thread.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/moc.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/resources.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/uic.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/yacc.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/lex.prf \
-		../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/include_source_dir.prf
-	$(QMAKE) -spec ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
-../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/g++.conf:
-../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/unix.conf:
-../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/common/linux.conf:
-../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/qconfig.pri:
-../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/modules/qt_webkit_version.pri:
-../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_functions.prf:
-../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt_config.prf:
-../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/exclusive_builds.prf:
-../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_pre.prf:
-../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/debug.prf:
-../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/default_post.prf:
-../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/warn_on.prf:
-../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/qt.prf:
-../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/unix/thread.prf:
-../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/moc.prf:
-../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/resources.prf:
-../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/uic.prf:
-../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/yacc.prf:
-../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/lex.prf:
-../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/features/include_source_dir.prf:
+Makefile: Unuk-QT.pro  /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \
+		/usr/share/qt4/mkspecs/common/unix.conf \
+		/usr/share/qt4/mkspecs/common/linux.conf \
+		/usr/share/qt4/mkspecs/qconfig.pri \
+		/usr/share/qt4/mkspecs/features/qt_functions.prf \
+		/usr/share/qt4/mkspecs/features/qt_config.prf \
+		/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+		/usr/share/qt4/mkspecs/features/default_pre.prf \
+		/usr/share/qt4/mkspecs/features/debug.prf \
+		/usr/share/qt4/mkspecs/features/default_post.prf \
+		/usr/share/qt4/mkspecs/features/warn_on.prf \
+		/usr/share/qt4/mkspecs/features/qt.prf \
+		/usr/share/qt4/mkspecs/features/unix/thread.prf \
+		/usr/share/qt4/mkspecs/features/moc.prf \
+		/usr/share/qt4/mkspecs/features/resources.prf \
+		/usr/share/qt4/mkspecs/features/uic.prf \
+		/usr/share/qt4/mkspecs/features/yacc.prf \
+		/usr/share/qt4/mkspecs/features/lex.prf \
+		/usr/share/qt4/mkspecs/features/include_source_dir.prf \
+		/usr/lib/libQtGui.prl \
+		/usr/lib/libQtCore.prl
+	$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
+/usr/share/qt4/mkspecs/common/g++.conf:
+/usr/share/qt4/mkspecs/common/unix.conf:
+/usr/share/qt4/mkspecs/common/linux.conf:
+/usr/share/qt4/mkspecs/qconfig.pri:
+/usr/share/qt4/mkspecs/features/qt_functions.prf:
+/usr/share/qt4/mkspecs/features/qt_config.prf:
+/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
+/usr/share/qt4/mkspecs/features/default_pre.prf:
+/usr/share/qt4/mkspecs/features/debug.prf:
+/usr/share/qt4/mkspecs/features/default_post.prf:
+/usr/share/qt4/mkspecs/features/warn_on.prf:
+/usr/share/qt4/mkspecs/features/qt.prf:
+/usr/share/qt4/mkspecs/features/unix/thread.prf:
+/usr/share/qt4/mkspecs/features/moc.prf:
+/usr/share/qt4/mkspecs/features/resources.prf:
+/usr/share/qt4/mkspecs/features/uic.prf:
+/usr/share/qt4/mkspecs/features/yacc.prf:
+/usr/share/qt4/mkspecs/features/lex.prf:
+/usr/share/qt4/mkspecs/features/include_source_dir.prf:
+/usr/lib/libQtGui.prl:
+/usr/lib/libQtCore.prl:
 qmake:  FORCE
-	@$(QMAKE) -spec ../../../QtSDK/Desktop/Qt/474/gcc/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
+	@$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile Unuk-QT.pro
 
 dist: 
 	@$(CHK_DIR_EXISTS) .tmp/Unuk-QT1.0.0 || $(MKDIR) .tmp/Unuk-QT1.0.0 
@@ -627,7 +624,8 @@ Bar.o: ../src/libUnuk/UI/Bar.cpp ../src/libUnuk/UI/Bar.h \
 		../src/libUnuk/System/Debug.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Bar.o ../src/libUnuk/UI/Bar.cpp
 
-Vec2.o: ../src/libUnuk/System/Vec2.cpp ../src/libUnuk/System/Vec2.h
+Vec2.o: ../src/libUnuk/System/Vec2.cpp ../src/libUnuk/System/Vec2.h \
+		../src/libUnuk/System/MathBox.h
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o Vec2.o ../src/libUnuk/System/Vec2.cpp
 
 ####### Install
diff --git a/src/libUnuk/System/Vec2.h b/src/libUnuk/System/Vec2.h
index 020d0fd..2173a25 100644
--- a/src/libUnuk/System/Vec2.h
+++ b/src/libUnuk/System/Vec2.h
@@ -1,5 +1,3 @@
-// I am drunk right now. Forgive me for any stupidity.
-
 #pragma once
 #include <vector>
 #include <math.h>