more improvements and remodeling. token is now needed for connection