Very minor changes.

Grouped units in upper left. Removed a test. Nothing special.