added org-bullets and rearranged a bit