store beta switch in user session
improve comments