Cleaned/fix up update-userid function. also some general cleanup.