Todo comments revised, nothing significant