Fixed multiple vulnerabilities and whatnot.
Reverted file mode
Resolve conflicts.
Fix typo.