Latest comm testing, minor style changes.