Add org-conf and modify some others
Update content