sprayed for bugs, morning commit.

- Sprayed for bugs.
- Cleaned up the code.
- Hopefully it works! :D