Touched up minor stuff