Some more comment cleanup and corrections.