diff --git a/internal/cli/cli.go b/internal/cli/cli.go
index a743708c..de895211 100644
--- a/internal/cli/cli.go
+++ b/internal/cli/cli.go
@@ -310,6 +310,7 @@ func (cli *CLI) ListMachines(ctx context.Context, clusterName string) error {
 	// Print the list of machines in a table format.
 	tw := tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)
 	// Print header.
+	// TODO: print ADDRESS instead of SUBNET which is a machine IP with prefix.
 	if _, err = fmt.Fprintln(tw, "NAME\tSUBNET\tPUBLIC KEY\tENDPOINTS"); err != nil {
 		return fmt.Errorf("write header: %w", err)
 	}
diff --git a/internal/machine/cluster/cluster.go b/internal/machine/cluster/cluster.go
index 2c28b318..d0ff1c0c 100644
--- a/internal/machine/cluster/cluster.go
+++ b/internal/machine/cluster/cluster.go
@@ -158,6 +158,7 @@ func (c *Cluster) AddMachine(ctx context.Context, req *pb.AddMachineRequest) (*p
 
 	// TODO: notify all cluster machines about the new machine so they can update their peers config.
 	//  In PoC we just notify the local machine.
+	// TODO: there is a race condition with network configuration if a new cluster is initialized on the machine.
 	c.newMachinesCh <- m
 
 	resp := &pb.AddMachineResponse{Machine: m}