Ad some Comments and TODOs