added user id to global user, other minor validations