Minor changes.
Major: new DLS implementation for C++ (part1).