lots of changes 11/15

i explained a lot of the changes in the comments so check those out