A couple of missing comments and TODOs