bulk comment fixes