fix name clashes, captcha bug, etc.
Merge pull request #95 from ccd0/names

fix name clashes, captcha bug, etc.