two comments / todos