org tweaks, removed bbdb.