fixed spelling errors and cleaned up code
added e_ops dict support to stochastic solvers
only average states when states are available