Doc comments, serviceproxy fixes