fixed a few bugs, messed with files for testing