Few more todo comments