Updated tags and user database references. First working bopy of Beta branch.