Major work on eshell settings