Made some changes and such.