diff --git a/TODO.md b/TODO.md
index d4ff8fb..f1a74ec 100644
--- a/TODO.md
+++ b/TODO.md
@@ -3,6 +3,9 @@
 ## Bugfixes
 
 - ActionJustPressed and KeyboardKeyJustPressed don't detect inputs consistently.
+  - **Solution**: This is a problem related to custom frame pacing for fixed timestep. Raylib polls input in BeginFrame, which means certain functions related to JustPressed* may work incorrectly when polled in a separate timestep. This can be fixed if the entire input system will be moved to SDL or with a custom render + input backend altogether.
+- Fix any remaining bugs with anchor positioning system.
+  - Containers don't position their chilren correctly when using anchors and adding/removing them. 
 
 ## Core
 
@@ -27,6 +30,7 @@
 
 - Serialize attribute.
 - Add automatic serialization of resources through source generation and System.Text.Json.
+  - Make sure this serialization system works well with CLR and NativeAOT.
 - ~~Provide means for fetching key/value configuration (INI? TOML?)~~
   - Expose some sort of ConfigFile class for safe key/value configuration fetching.
 
@@ -67,14 +71,14 @@
 
 ## UI
 
-- Basic widgets (button, label, text input)
-- Layout
-  - Containers
+- ~~Layout~~
+  - ~~Containers~~
     - ~~VerticalContainer~~
     - ~~HorizontalContainer~~
     - ~~GridContainer~~
     - ~~FlexContainer~~
-  - Positioning (anchors)
+  - ~~Positioning (anchors)~~
+- Move layouting to Render instead of Update, use Update for input.
 - Input propagation
 - Basic input elements (button, text field, toggle).
 - Styling.