Small corrections. Apparently we want to generate unique ID *before* we use it as a selector.
Merge remote-tracking branch 'origin/master'