More commenting in Machina