Improved state file

Changes are necessary for successful graphite installation.  Some changes are just improved methods for performing states.