Some minor changes... all wrapped up for now