Fixed examples and added TODOs