diff --git a/CHANGELOG.md b/CHANGELOG.md
index e16959565..24ebb0880 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Added support for PHP8.2
+- Added a new way to extend Smarty functionality using `Smarty::addExtension()`
 
 ### Changed
 - All Smarty code is now in the \Smarty namespace. For simple use-cases, you only need to add
@@ -29,7 +30,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `$smarty->setPluginsDir()`
 - `$smarty->assignGlobal()`
 - Using `$smarty->registerFilter()` for registering variable filters will trigger a notice.
-- 
 
 ### Removed
 - Dropped support for PHP7.1
@@ -55,7 +55,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Removed `$smarty->loadPlugin()`, use `$smarty->registerPlugin()` instead.
 - Removed `$smarty->appendByRef()` and `$smarty->assignByRef()`.
 - Removed `$smarty->_current_file`
-- Removed `$smarty->allow_ambiguous_resources`, but ambiguous resources handlers should still work
+- Removed `$smarty->allow_ambiguous_resources` (ambiguous resources handlers should still work)
 
 ### Fixed
 - `$smarty->muteUndefinedOrNullWarnings()` now also mutes PHP7 notices for undefined array indexes [#736](https://github.com/smarty-php/smarty/issues/736)
diff --git a/TODO.txt b/TODO.txt
index 3ba70cb07..511ae1bf1 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,5 +1,16 @@
 # @TODO
 
+## 5.0
+- fix template invalidation when migrating to 5.0
+- document addExtension
+- review docs
+- maybe add nullsafe operator ?? as launching feature?
+
+## CI-building optimization
+- compiled & cached templates should not contain references to local filesystem paths. Add an optional rootpath param
+  to `(add|set)TemplateDir` or as a separate method. Make it default to `getcwd()`. If a relative path is passed to
+  `(add|set)TemplateDir`, prefix it with the rootpath at runtime, but do not store the path.
+
 ## Review direct variable property access
 - review ->value{$index} in ForTag
 
@@ -22,9 +33,6 @@
 ## Beatify output
 - compiled templates could be proper classes, possibly using [nette/php-generator](https://packagist.org/packages/nette/php-generator)
 
-## Documentation
-- beautify and review docs, possibly using [Material for MkDocs](https://squidfunk.github.io/mkdocs-material/publishing-your-site/)
-
 ## Unrelated / other
 - review (and avoid) use of 'clone' keyword
 - compiler->has_code seems silly. Why not have proper return values?