Made some modifications for aliases and vim key bindings