Vi mode in shell isn't for me...
Some adjustments...