looks like Joel covered everything.  lgtm after the style fixes.
-mike