Some comment cleanup and additions