Some more comment changes