improve sign-up
improve signup; misc
improve signup; misc
resolve merging conficts