mostly comment changes