Minor fixes before doing THE BIG THING.