updated user data regexs
sample and edition essentially finished