restricted moving to users #44 and other bugs