cleaned up, added org mode