updated TODO (rearranged by prio)