More maintenance repairs of old code. Lots of changes to User functionality, including updates to users.yml.  These changes may have unforeseen repercussions elsewhere.