[PATCH 1/3] significant overhaul and QA of auditing section