Made some more small changes