Improving the UUID stuff to use less memory

Also some cleanup stuff.