Fixed a couple compile bugs, added get-machines