Made corrections based of Yuji's comments.