edited the directory a bit, added a few more tests, and made changes based on feedback