Many EShell Fixes

We are now including EShell and got it working well.