Merge pull request #3 from rowanu/graphite-megacarbon

Fix several problems with filters
Add missing state module items for completeness