Update changelog + minor comment fix