changes to reveal action, scope fixes in User