Todo changes and comments