getting 'master' setup properly again