tweaked comment
fixed TODO
refactored shuffle option and method to allow for shuffle(movesAway), updated docs and tests