More org configuration options and updated TODO