Added more API doc.
Settings refactoring.
Temporary fix for broken dependency.
Fixed client dep problem.