Made a few other changes