--- deliantra/server/Changes	2008/04/20 20:01:28	1.103
+++ deliantra/server/Changes	2008/04/21 06:16:01	1.104
@@ -1,11 +1,16 @@
 Deliantra MORPG Server, Maps and Archetypes ChangeLog.
 
+TODO: ridify us from FLAG_NO_FIX_PLAYER
 TODO: picking up the torches in nimbus seemingly works, but after
       a while (used up?) they seem to be gone from the inv but the client doesn't know about that.
 TODO: dragons should not be able to change their title via the settings tab in playerbook
 
 	- reloading archetypes while a user was in the character creation phase
           could crash the server.
+        - merge items with different arch pointers refering to the same arch
+          (due to archetype reloads).
+        - completely rewrite the weight handling, fixing a number of bugs.
+        - refactored the object remove/insert functions.
 
 2.51  Sun Apr 20 21:27:37 CEST 2008
 	- properly link against libgthread as that is needed to make the slice