Touched up a few more things