Some changes, though I'm actually noot using this.  Should massage it into being useful again...