Reinit (to remove password) and add config file
merge upstream