Machine active states and other random stuff.
Minor fix.
Merge pull request #31 from Morton00000/master

Machine active states and other random stuff.