Fixed typo in form validation and removed unused code.
Added sole proprietor to pjson output
Merge branch 'my'