Made a bunch of changes

almost DONE!!!!