tweaks, notmuch, abbrevs, scala improvements