Modified files

I changed a bunch of stuff based on my round one trial.