Rework CraftChatMessage and other things