additional auditing elements, comment cleanup