Add check for whether flow state map is included
Add covariant getMean() method, fix bug in includesFlows