Added TODOS and fixed example.