mainly comment changes