Fixed comment.
Clean up space.
Improved support UUIDs and tests.