org mode, deft support and some extensive changes