fixing some setup issues and adding user login