Added customizable waitForMovement with Callable<Boolean>, and other misc changes.