Modified a lot of stuff

I can't even begin