Adjust options page and add comments