Minor fixes & update doc.