Completed the questions and added comments