Tried fixing more code audit issues at a more in depth level