diff --git a/ChangeLog b/ChangeLog
index e895e582a..cf104de04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+0.85 -> 0.86 (Aug 01 2011)
+GENERAL:
+* New artifacts supported
+- Admiral's Hat
+- Titan's Thunder
+* vERM parser & interpreter
+* Bonus caching system
+* .tga file support
+
+BATTLES:
+* Correct handling of siege obstacles
+* Catapult animation
+* New combat abilities supported
+- Dragon Breath
+- Three-headed Attack
+- Attack all around
+- Death Cloud / Fireball area attack
+- Death Blow
+- Lightning Strike
+- Rebirth
+* New WoG abilities supported
+- Defense Bonus
+- Cast before attack
+- Immunity to direct damage spells
+* New spells supported
+- Magic Mirror
+- Titan's Lightning Bolt
+
 0.84 -> 0.85 (Jun 01 2011)
 GENERAL:
 * Support for stack experience
diff --git a/config/cr_shots.txt b/config/cr_shots.txt
index 454820357..b6a3f55f9 100644
--- a/config/cr_shots.txt
+++ b/config/cr_shots.txt
@@ -1,40 +1,40 @@
 //here are defs with things shot by different units - don't delete this line; format: unit_ID def_name spin_projectile
 2 PLCBOWX.DEF 0
 3 PLCBOWX.DEF 0
-8 CPRZEAX.DEF 0
-9 CPRZEAX.DEF 0
+8 CPRZEAX.DEF 1
+9 CPRZEAX.DEF 1
 18 PELFX.DEF 0
 19 PELFX.DEF 0
-29 CPRGRE.DEF 0
-34 PMAGEX.DEF 0
-35 PMAGEX.DEF 0
+29 CPRGRE.DEF 1
+34 PMAGEX.DEF 1
+35 PMAGEX.DEF 1
 41 CPRGTIX.DEF 0
-44 CPRGOGX.DEF 0
-45 CPRGOGX.DEF 0
+44 CPRGOGX.DEF 1
+45 CPRGOGX.DEF 1
 64 PLICH.DEF 0
 65 PLICH.DEF 0
 74 SMBALX.DEF 0
 75 SMBALX.DEF 0
 76 PMEDUSX.DEF 0
 77 PMEDUSX.DEF 0
-88 PORCHX.DEF 0
-89 PORCHX.DEF 0
-94 PCYCLBX.DEF 0
-95 PCYCLBX.DEF 0
+88 PORCHX.DEF 1
+89 PORCHX.DEF 1
+94 PCYCLBX.DEF 1
+95 PCYCLBX.DEF 1
 100 PPLIZAX.DEF 0
 101 PPLIZAX.DEF 0
 123 PICEE.DEF 0
 127 CPRGTIX.DEF 0
 136 SMBALX.DEF 0
 137 PELFX.DEF 0
-138 PHALF.DEF 0
+138 PHALF.DEF 1
 145 SMCATX.DEF 1
 146 SMBALX.DEF 0
 152 CPRGTIX.DEF 0
 169 CPRZEAX.DEF 0
 170 PLCBOWX.DEF 0
 171 PLCBOWX.DEF 0
-173 CPRGRE.DEF 0
+173 CPRGRE.DEF 1
 193 SMBALX.DEF 0
 196 SMBALX.DEF 0
 -1
diff --git a/lib/CGameInterface.cpp b/lib/CGameInterface.cpp
index 058a6f096..cfc238498 100644
--- a/lib/CGameInterface.cpp
+++ b/lib/CGameInterface.cpp
@@ -63,7 +63,11 @@ rett * createAny(std::string dllname, std::string methodName)
 #ifdef _WIN32
 std::string getAIFileName(std::string input)
 {
-	return input + '.' + LIB_EXT;
+	size_t found=input.find(LIB_EXT);
+	if (found != std::string::npos) //quick, dirty fix
+		return input;
+	else
+		return input + '.' + LIB_EXT;
 }
 #else
 std::string getAIFileName(std::string input)
diff --git a/server/CGameHandler.h b/server/CGameHandler.h
index 14422114e..49f5131c0 100644
--- a/server/CGameHandler.h
+++ b/server/CGameHandler.h
@@ -184,7 +184,7 @@ public:
 	void vistiCastleObjects (const CGTownInstance *t, const CGHeroInstance *h);
 	void levelUpHero(int ID, int skill);//handle client respond and send one more request if needed
 	void levelUpHero(int ID);//initial call - check if hero have remaining levelups & handle them
-	void afterBattleCallback(); // called after level-ups are finished, ID is just temporarily for compatibility
+	void afterBattleCallback(); // called after level-ups are finished
 	//////////////////////////////////////////////////////////////////////////
 
 	void commitPackage(CPackForClient *pack) OVERRIDE;