fixes most of the code audits