Updates to todo and issues