Supermatter fixes, code cleanup and refactoring. Shards don't announce anything.

Also minor tweaks to shard values.