Minor changes and stuff.