implemented user management, fixes #803. Minor refactorings.