updated Todo's

@goldido87 - can you do that ? :)