disable org-contacts and some minor changes
error fixed
heavily cleanup