minor changes along the way
further improvements, mu4e integration