Added conf for client and doc fixes