Working!

Finally doing what it's supposed to, still a ways from being done
though.
Cleanup
General fixes

Added a little more configurability, improved performance
Comment Cleanup