Updated a few things with CList