Addressed most of comments.