added some more aliases and redid vim completion