Some minor tinkering.