Update TODO list

Re-order and re-think TODO list a bit based on new insights.