Added user info saving and other updates