Changed DList implementation and a few errors.
Fixed merge conflicts.