updated aliases and conf