Changes made through the week

Will comment more later