Some Comm fixes.
Merge pull request #1 from dcjones/comm_rebase

Some Comm fixes.