Several small fixes, including xcaptcha form issue
Merge pull request #208 from geekwright/fixes

Several small fixes, including xcaptcha form issue