simplified uuid generation, fixed comments