Resetting to default values + comment edit