updated pretty much all files haha