Extra todo comments on config and ir keys & validation