diff --git a/dlls/cstrike/CstrikePlayer.cpp b/dlls/cstrike/CstrikePlayer.cpp
index a5fc5caa..e7a53a70 100755
--- a/dlls/cstrike/CstrikePlayer.cpp
+++ b/dlls/cstrike/CstrikePlayer.cpp
@@ -11,22 +11,10 @@
 
 CCstrikePlayer::CCstrikePlayer()
 {
-	//SetOnline(false);
 	SetModelled(false);
-	//SetTime(0.0);
 	SetInspectModel(false);
 }
 
-/*bool CCstrikePlayer::GetOnline()
-{
-	return online;
-}
-
-bool CCstrikePlayer::SetOnline(bool onlineIn)
-{
-	return online = onlineIn;
-}*/
-
 bool CCstrikePlayer::GetModelled()
 {
 	return modelled;
@@ -45,22 +33,11 @@ const char* CCstrikePlayer::GetModel()
 	return model;
 }
 
-const char* CCstrikePlayer::SetModel(const char* modelIn)
+void CCstrikePlayer::SetModel(const char* modelIn)
 {
-	//SetTime(0.0);
-	return strcpy(model, modelIn);
+	strcpy(model, modelIn);
 }
 
-/*float CCstrikePlayer::GetTime()
-{
-	return time;
-}
-
-void CCstrikePlayer::SetTime(float timeIn)
-{
-	time = timeIn;
-}
-*/
 bool CCstrikePlayer::GetInspectModel()
 {
 	return inspectModel;
diff --git a/dlls/cstrike/CstrikePlayer.h b/dlls/cstrike/CstrikePlayer.h
index e0e52bae..56d6891d 100755
--- a/dlls/cstrike/CstrikePlayer.h
+++ b/dlls/cstrike/CstrikePlayer.h
@@ -10,22 +10,17 @@ class CCstrikePlayer
 public:
 	CCstrikePlayer();
 
-	/*bool GetOnline();
-	bool SetOnline(bool onlineIn);*/
 	bool GetModelled();
 	bool SetModelled(bool modelledIn);
-	//float GetTime();
-	//void SetTime(float timeIn);
 	const char* GetModel();
-	const char* SetModel(const char* modelIn);
+	void SetModel(const char* modelIn);
 	bool GetInspectModel();
 	void SetInspectModel(bool inspectModelIn);
 
 private:
-	bool online, inspectModel;
+	bool inspectModel;
 	bool modelled;
 	char model[32];
-	//float time;
 };
 
 #endif // !defined(INCLUDED_CCSTRIKEPLAYER)
diff --git a/dlls/cstrike/cstrike.dsp b/dlls/cstrike/cstrike.dsp
index ae9657c0..169296c9 100755
--- a/dlls/cstrike/cstrike.dsp
+++ b/dlls/cstrike/cstrike.dsp
@@ -53,10 +53,10 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"Release/cstrike_amxx.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=echo Copying dll...	copy Release\cstrike_amxx.dll K:\S\cstrike\addons\amx\dlls	echo Copying inc...	copy cstrike_amxx.inc K:\S\cstrike\addons\amx\examples\include
+PostBuild_Cmds=echo Copying dll...	copy Release\cstrike.dll K:\S\cstrike\addons\amx\dlls	echo Copying inc...	copy ..\plugins\include\cstrike.inc K:\S\cstrike\addons\amx\examples\include
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "cstrike - Win32 Debug"
@@ -125,7 +125,7 @@ SOURCE=.\CstrikePlayer.h
 # End Group
 # Begin Source File
 
-SOURCE=.\cstrike_amxx.inc
+SOURCE=..\plugins\include\cstrike.inc
 # End Source File
 # End Target
 # End Project
diff --git a/dlls/cstrike/cstrike.h b/dlls/cstrike/cstrike.h
index e4b4d829..af29e46b 100755
--- a/dlls/cstrike/cstrike.h
+++ b/dlls/cstrike/cstrike.h
@@ -66,11 +66,11 @@ pfnmodule_engine_g* g_engModuleFunc;
 
 #define NAME "Counter-Strike"
 #define AUTHOR "AMX Mod X Dev Team"
-#if defined CS_WON_BUILD
+#if defined __cswonbuild__
 #define VERSION "0.1 WON" // change both these versions
 #else
 #define VERSION "0.1" // change both these versions
-#endif // defined CS_WON_BUILD
+#endif // defined __cswonbuild__
 #define URL "http://www.amxmodx.org"
 #define LOGTAG "AMXCS"
 #define DATE __DATE__
@@ -114,7 +114,7 @@ pfnmodule_engine_g* g_engModuleFunc;
 	#define OFFSET_WEAPONTYPE			43 + EXTRAOFFSET // same as STEAM
 	#define OFFSET_SILENCER_FIREMODE	70 + EXTRAOFFSET // differs -4 from STEAM
 	// "hostage_entity" entities
-	//#define OFFSET_HOSTAGEFOLLOW		86 + EXTRAOFFSET // NOT YET CHECKED!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! find out before build
+	#define OFFSET_HOSTAGEFOLLOW		86 + EXTRAOFFSET // same as STEAM
 	#define OFFSET_HOSTAGEID			487 + EXTRAOFFSET // same as STEAM
 #else // from here STEAM build looks for offsets
 	// "player" entities