Better org and magit setup.