comments feature, backup fix