Comments & doc update