Made a few more changes!