Improve listmachines a bunch