Fix memory leak (UUIDs are not cleaning themselves up at all).
- Fixed up a few command errors.
Merge remote-tracking branch 'origin/master'