Some minor changes, primarily for random stuff.