another round of comments fixed