Updated pretty much all the files