more comment cleanup/update