Fixing my derps last night.

- Fixed everything that x3n0 pointed out.