diff --git a/ChangeLog.md b/ChangeLog.md
index ff8582cd3..f9e598e2b 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,7 +1,10 @@
 # 1.1.1 -> 1.2.0
-(unreleased, changes for 1.1.1..9c59025)
+(unreleased, changes for 1.1.1..ecbbbed)
 
 ### GENERAL:
+* Adventure map rendering was entirely rewritten with better, more functional code
+* Client battle code was heavily reworked, leading to better visual look & feel and fixing multiple minor battle bugs / glitches
+* Client mechanics are now framerate-independent, rather than speeding up with higher framerate
 * Implemented hardware cursor support
 * Heroes III language can now be detected automatically
 * Increased targeted framerate from 48 to 60
@@ -11,43 +14,77 @@
 * Fixed missing obstacles in battles on subterranean terrain 
 * Added vcmifaerie, vcmiazure, vcmiarmy, vcmiexp cheats
 * Video files now play at correct speed
+* Fixed crash on switching to second mission in campaigns
+* Fixed oversided message window from Scholar skill that had confirmation button outside game window
 
 ### MAP EDITOR:
-* Added translations to German, Polish, Russian, Ukrainian
+* Added translations to German, Polish, Russian, Spanish, Ukrainian
 * Implemented cut/copy/paste operations
 * Implemented lasso brush for terrain editing
+* Toolbar actions now have names
 
 ### LAUNCHER:
+* Added initial Welcome/Setup screen for new players
+* Added option to install translation mod if such mod exists and player's H3 version has different language
 * Icons now have higher resolution, to prevent upscaling artifacts
-* Added translations to German, Polish, Russian, Ukrainian
+* Added translations to German, Polish, Russian, Spanish, Ukrainian
 * Mods tab layout has been adjusted based on feedback from players
 * Settings tab layout has been redesigned to support longer texts
 * Added button to start map editor directly from Launcher
 
+### AI PLAYER:
+* AI should now be more active in destroying heroes causing treat on AI towns
+* AI now has higher priority for resource-producing mines
+* Increased AI priority of town dwelling upgrades
+* AI will now de-prioritize town hall upgrades when low on resources
+
 ### ADVENTURE MAP:
+* Added option to replace popup messages on object visiting with messages in status window
 * Implemented different hero movement sounds for offroad movement
 * Cartographers now reveal terrain in the same way as in H3
-* Holding ALT will now show movement points information in status bar
+* Status bar will now show movement points information on pressing ALT or after enabling option in settings
 * It is now not possible to receive rewards from School of War without required gold amount
 * Owned objects, like Mines and Dwellings will always show their owner in status bar
 * It is now possible to interact with on-map Shipyard when no hero is selected
+* Added option to show amount of creatures as numeric range rather than adjective
+* Added option to show map grid
+* Map swipe is no longer exclusive for phones and can be enabled on desktop platforms
+* Added more graduated settigns for hero movement speed
+* Map scrolling is now more graduated and scrolls with pixel-level precision
+* Hero movement speed now matches H3
+* Improved performance of adventure map rendering
+* Fixed embarking and disembarking sounds
+* Fixed loading of sleeping status and movement path of heroes
+* Fixed selection of "new week" animation for status window
+* Object render order now mostly matches H3
 
-## INTERFACE
+### INTERFACE
+* Implemented new settings window
+* Added framerate display option
 * Fixed white status bar on server connection screen
 * Buttons in battle window now correctly show tooltip in status bar
 * Fixed cursor image during enemy turn in combat
-* Fixed cases of incorrect artifact slot highlighting
 * Game will no longer promt to assemble artifacts if they fall into backpack
 * It is now possible to use in-game console for vcmi commands
 * Stacks sized 1000-9999 units will not be displayed as "1k"
 * It is now possible to select destination town for Town Portal via double-click
 
+### HERO SCREEN
+* Fixed cases of incorrect artifact slot highlighting
+* Improved performance of artifact exchange operation
+* Picking up composite artifact will immediately unlock slots
+* It is now possible to swap two composite artifacts
+
 ### TOWN SCREEN
 * Fixed gradual fade-in of a newly built building
 * Fixed duration of building fade-in to match H3
 * Fixed rendering of Shipyard in Castle
+* Blacksmith purchase button is now properly locked if artifact slot is occupied by another warmachine
+* Added option to show number of available creatures in place of growth
 
 ### BATTLES:
+* Added settings for even faster animation speed than in H3
+* Added option to skip battle opening music entirely
 * All effects will now wait for battle opening sound before playing
 * Hex highlighting will now be disabled during enemy turn
 * Fixed incorrect log message when casting spell that kills zero units
@@ -114,14 +151,21 @@
 ### MODDING:
 * All configurable objects from H3 now have their configuration in json
 * Improvements to functionality of configurable objects
+* Replaced `SECONDARY_SKILL_PREMY` bonus with separate bonuses for each skill. See https://wiki.vcmi.eu/List_of_all_bonus_types
+* Removed multiple bonuses that can be replaced with another bonus. See https://wiki.vcmi.eu/List_of_all_bonus_types
 * It is now possible to define new hero movement sounds in terrains
 * Implemented translation support for mods
+* Implemented translation support for .h3m maps and .h3c campaigns
+* Translation mods are now automatically disabled if player uses different language
 * Files with new Terrains, Roads and Rivers are now validated by game
 * Parameters controlling effect of attack and defences stats on damage are now configurable in defaultMods.json
-* New bonus: LIMITED_SHOOTING_RANGE. Creatures with this bonus can only use ranged attack within specified range
+* New bonus: `LIMITED_SHOOTING_RANGE`. Creatures with this bonus can only use ranged attack within specified range
 * Battle window and Random Map Tab now have their layout defined in json file
 * Implemented code support for alternative actions mod
 * Implemented code support for improved random map dialog
+* It is now possible to configure number of creature stacks in heroes' starting armies
+* It is now possible to configure number of constructed dwellings in towns on map start
+* Game settings previously located in defaultMods.json are now loaded directly from mod.json
 
 # 1.1.0 -> 1.1.1
 
diff --git a/lib/CCreatureSet.h b/lib/CCreatureSet.h
index 11fe1a656..557fc72e1 100644
--- a/lib/CCreatureSet.h
+++ b/lib/CCreatureSet.h
@@ -26,8 +26,8 @@ class JsonSerializeFormat;
 class DLL_LINKAGE CStackBasicDescriptor
 {
 public:
-	const CCreature *type;
-	TQuantity count = -1;; //exact quantity or quantity ID from CCreature::getQuantityID when getting info about enemy army
+	const CCreature *type = nullptr;
+	TQuantity count = -1; //exact quantity or quantity ID from CCreature::getQuantityID when getting info about enemy army
 
 	CStackBasicDescriptor();
 	CStackBasicDescriptor(const CreatureID & id, TQuantity Count);