Fixed a few issues which were starting to bug me.

This code works as well as I need it to. I call it done!
README!