lots of fixes to update/create users