Made some misc changes