some changes for org mode and font size
some merge changes