bug fixes in comments code