Issues #1, #2, #4, #5:

Cleaned up a bunch of issues related to this tool