Updated todo and known issues