Resolved some comments