Fixes
Improving work with users slightly. Fixing a problem in connect
Merge pull request #186 from fluke777/minor_cleanup

Fixes