comments now consistent with db