Cleaned up a lot of things, few tweaks, one bug fix where I wasn't freeing a list in the tests file.