Made some general changes