some more changes at comments