add some todos, linebreaks