revert elscreen, improve js, tweak eshell