Fixing a bunch of little things.