Users, minor database changes

Started on managing users and minor database changes