new machine tags

also addresses #106 (partially)