Minor changes and such.