Merged dhr's todo and ideas update