restricted moving to users #44 and other bugs
Merge pull request #45 from mikeedwards/bug-fixes

restricted moving to users #44 and other bugs