Various updates

The eshell prompt is the highlight of this bunched update!