Small fixes in slides
Add more TODOs