Some code comments and TODOs