Getting ready for ergodic moves

Code cleanup
Documentation fix
Added number of passes
Added test for number of passes