Add better audit diff and bug fixes